From: Bruno Haible Date: Wed, 7 Nov 2007 00:41:45 +0000 (+0000) Subject: Regenerated for 0.17. X-Git-Tag: v0.17~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51985ab7783d0b3dd5f22655a2db7ba55115756b;p=thirdparty%2Fgettext.git Regenerated for 0.17. --- diff --git a/NEWS b/NEWS index 8d37a0d0a..a37bfa541 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Version 0.17 - October 2007 +Version 0.17 - November 2007 * License: The gettext related programs and tools are now licensed under the GPL diff --git a/autoconf-lib-link/tests/rpathlx/Makefile.in b/autoconf-lib-link/tests/rpathlx/Makefile.in index 9e70c3415..e3d36e0a1 100644 --- a/autoconf-lib-link/tests/rpathlx/Makefile.in +++ b/autoconf-lib-link/tests/rpathlx/Makefile.in @@ -45,9 +45,10 @@ DIST_COMMON = $(am__configure_deps) \ $(top_srcdir)/configure ../../../build-aux/compile \ ../../../build-aux/config.guess \ ../../../build-aux/config.rpath ../../../build-aux/config.sub \ - ../../../build-aux/elisp-comp ../../../build-aux/install-sh \ - ../../../build-aux/ltmain.sh ../../../build-aux/mdate-sh \ - ../../../build-aux/missing ../../../build-aux/mkinstalldirs \ + ../../../build-aux/depcomp ../../../build-aux/elisp-comp \ + ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \ + ../../../build-aux/mdate-sh ../../../build-aux/missing \ + ../../../build-aux/mkinstalldirs \ ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -112,6 +113,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBRPATHX = @LIBRPATHX@ +LIBRPATHX_PREFIX = @LIBRPATHX_PREFIX@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ LTLIBRPATHX = @LTLIBRPATHX@ diff --git a/autoconf-lib-link/tests/rpathlx/configure b/autoconf-lib-link/tests/rpathlx/configure index 3704497b8..70ffe1f3f 100755 --- a/autoconf-lib-link/tests/rpathlx/configure +++ b/autoconf-lib-link/tests/rpathlx/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60. +# Generated by GNU Autoconf 2.61. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -10,7 +10,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; } else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -233,7 +237,6 @@ IFS=$as_save_IFS # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : _ASEOF @@ -253,7 +258,6 @@ _ASEOF CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : (as_func_return () { @@ -512,19 +518,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -647,6 +662,7 @@ host_vendor host_os LIBRPATHX LTLIBRPATHX +LIBRPATHX_PREFIX global_top_auxdir LIBOBJS LTLIBOBJS' @@ -657,6 +673,7 @@ target_alias CC CFLAGS LDFLAGS +LIBS CPPFLAGS' @@ -763,10 +780,10 @@ do -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -782,10 +799,10 @@ do -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -979,19 +996,19 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=no ;; --x) @@ -1251,6 +1268,7 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory @@ -1318,7 +1336,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1332,7 +1350,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1745,7 +1763,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1873,7 +1891,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -1926,7 +1944,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2065,7 +2083,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2105,7 +2123,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2181,7 +2199,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2221,7 +2239,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2278,7 +2296,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2319,7 +2337,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2377,7 +2395,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2421,7 +2439,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2562,7 +2580,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2590,6 +2608,12 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2601,8 +2625,6 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -2780,27 +2802,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -2855,27 +2860,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -2910,27 +2898,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -2966,27 +2937,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3102,27 +3056,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -3561,12 +3498,14 @@ fi { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then enableval=$enable_rpath; : @@ -3608,6 +3547,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -3652,6 +3592,7 @@ fi LIBRPATHX= LTLIBRPATHX= INCRPATHX= + LIBRPATHX_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -3685,27 +3626,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -3723,26 +3687,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -3768,10 +3748,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" haveit= for x in $rpathdirs; do @@ -3803,7 +3783,7 @@ fi if test -z "$haveit"; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" else LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name" @@ -3822,6 +3802,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHX_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -3972,21 +3953,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$flag" done @@ -4001,6 +3982,7 @@ fi ac_cv_librpathx_libs="$LIBRPATHX" ac_cv_librpathx_ltlibs="$LTLIBRPATHX" ac_cv_librpathx_cppflags="$INCRPATHX" + ac_cv_librpathx_prefix="$LIBRPATHX_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathx_libs" >&5 @@ -4008,6 +3990,7 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6; } LIBRPATHX="$ac_cv_librpathx_libs" LTLIBRPATHX="$ac_cv_librpathx_ltlibs" INCRPATHX="$ac_cv_librpathx_cppflags" + LIBRPATHX_PREFIX="$ac_cv_librpathx_prefix" for element in $INCRPATHX; do haveit= @@ -4033,6 +4016,7 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6; } + HAVE_LIBRPATHX=yes @@ -4204,7 +4188,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -4213,10 +4198,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -4440,19 +4428,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -4468,7 +4465,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4496,7 +4493,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -4515,7 +4512,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -4767,12 +4764,13 @@ host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim LIBRPATHX!$LIBRPATHX$ac_delim LTLIBRPATHX!$LTLIBRPATHX$ac_delim +LIBRPATHX_PREFIX!$LIBRPATHX_PREFIX$ac_delim global_top_auxdir!$global_top_auxdir$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/autoconf-lib-link/tests/rpathly/Makefile.in b/autoconf-lib-link/tests/rpathly/Makefile.in index 7092658c0..fa7903634 100644 --- a/autoconf-lib-link/tests/rpathly/Makefile.in +++ b/autoconf-lib-link/tests/rpathly/Makefile.in @@ -45,9 +45,10 @@ DIST_COMMON = $(am__configure_deps) \ $(top_srcdir)/configure ../../../build-aux/compile \ ../../../build-aux/config.guess \ ../../../build-aux/config.rpath ../../../build-aux/config.sub \ - ../../../build-aux/elisp-comp ../../../build-aux/install-sh \ - ../../../build-aux/ltmain.sh ../../../build-aux/mdate-sh \ - ../../../build-aux/missing ../../../build-aux/mkinstalldirs \ + ../../../build-aux/depcomp ../../../build-aux/elisp-comp \ + ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \ + ../../../build-aux/mdate-sh ../../../build-aux/missing \ + ../../../build-aux/mkinstalldirs \ ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -112,6 +113,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBRPATHY = @LIBRPATHY@ +LIBRPATHY_PREFIX = @LIBRPATHY_PREFIX@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ LTLIBRPATHY = @LTLIBRPATHY@ diff --git a/autoconf-lib-link/tests/rpathly/configure b/autoconf-lib-link/tests/rpathly/configure index 897c5a158..cb30caaa4 100755 --- a/autoconf-lib-link/tests/rpathly/configure +++ b/autoconf-lib-link/tests/rpathly/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60. +# Generated by GNU Autoconf 2.61. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -10,7 +10,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; } else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -233,7 +237,6 @@ IFS=$as_save_IFS # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : _ASEOF @@ -253,7 +258,6 @@ _ASEOF CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : (as_func_return () { @@ -512,19 +518,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -647,6 +662,7 @@ host_vendor host_os LIBRPATHY LTLIBRPATHY +LIBRPATHY_PREFIX global_top_auxdir LIBOBJS LTLIBOBJS' @@ -657,6 +673,7 @@ target_alias CC CFLAGS LDFLAGS +LIBS CPPFLAGS' @@ -763,10 +780,10 @@ do -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -782,10 +799,10 @@ do -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -979,19 +996,19 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=no ;; --x) @@ -1251,6 +1268,7 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory @@ -1318,7 +1336,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1332,7 +1350,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1745,7 +1763,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1873,7 +1891,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -1926,7 +1944,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2065,7 +2083,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2105,7 +2123,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2181,7 +2199,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2221,7 +2239,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2278,7 +2296,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2319,7 +2337,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2377,7 +2395,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2421,7 +2439,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2562,7 +2580,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2590,6 +2608,12 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2601,8 +2625,6 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -2780,27 +2802,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -2855,27 +2860,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -2910,27 +2898,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -2966,27 +2937,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3102,27 +3056,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -3561,12 +3498,14 @@ fi { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then enableval=$enable_rpath; : @@ -3608,6 +3547,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -3652,6 +3592,7 @@ fi LIBRPATHY= LTLIBRPATHY= INCRPATHY= + LIBRPATHY_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -3685,27 +3626,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -3723,26 +3687,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -3768,10 +3748,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" haveit= for x in $rpathdirs; do @@ -3803,7 +3783,7 @@ fi if test -z "$haveit"; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" else LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-l$name" @@ -3822,6 +3802,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHY_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -3972,21 +3953,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$flag" done @@ -4001,6 +3982,7 @@ fi ac_cv_librpathy_libs="$LIBRPATHY" ac_cv_librpathy_ltlibs="$LTLIBRPATHY" ac_cv_librpathy_cppflags="$INCRPATHY" + ac_cv_librpathy_prefix="$LIBRPATHY_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathy_libs" >&5 @@ -4008,6 +3990,7 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6; } LIBRPATHY="$ac_cv_librpathy_libs" LTLIBRPATHY="$ac_cv_librpathy_ltlibs" INCRPATHY="$ac_cv_librpathy_cppflags" + LIBRPATHY_PREFIX="$ac_cv_librpathy_prefix" for element in $INCRPATHY; do haveit= @@ -4033,6 +4016,7 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6; } + HAVE_LIBRPATHY=yes @@ -4204,7 +4188,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -4213,10 +4198,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -4440,19 +4428,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -4468,7 +4465,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4496,7 +4493,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -4515,7 +4512,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -4767,12 +4764,13 @@ host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim LIBRPATHY!$LIBRPATHY$ac_delim LTLIBRPATHY!$LTLIBRPATHY$ac_delim +LIBRPATHY_PREFIX!$LIBRPATHY_PREFIX$ac_delim global_top_auxdir!$global_top_auxdir$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/autoconf-lib-link/tests/rpathlyx/Makefile.in b/autoconf-lib-link/tests/rpathlyx/Makefile.in index 2dd09e579..030479a98 100644 --- a/autoconf-lib-link/tests/rpathlyx/Makefile.in +++ b/autoconf-lib-link/tests/rpathlyx/Makefile.in @@ -45,9 +45,10 @@ DIST_COMMON = $(am__configure_deps) \ $(top_srcdir)/configure ../../../build-aux/compile \ ../../../build-aux/config.guess \ ../../../build-aux/config.rpath ../../../build-aux/config.sub \ - ../../../build-aux/elisp-comp ../../../build-aux/install-sh \ - ../../../build-aux/ltmain.sh ../../../build-aux/mdate-sh \ - ../../../build-aux/missing ../../../build-aux/mkinstalldirs \ + ../../../build-aux/depcomp ../../../build-aux/elisp-comp \ + ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \ + ../../../build-aux/mdate-sh ../../../build-aux/missing \ + ../../../build-aux/mkinstalldirs \ ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -112,7 +113,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBRPATHX = @LIBRPATHX@ +LIBRPATHX_PREFIX = @LIBRPATHX_PREFIX@ LIBRPATHY = @LIBRPATHY@ +LIBRPATHY_PREFIX = @LIBRPATHY_PREFIX@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ LTLIBRPATHX = @LTLIBRPATHX@ diff --git a/autoconf-lib-link/tests/rpathlyx/configure b/autoconf-lib-link/tests/rpathlyx/configure index 172fe72a2..ce9b10506 100755 --- a/autoconf-lib-link/tests/rpathlyx/configure +++ b/autoconf-lib-link/tests/rpathlyx/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60. +# Generated by GNU Autoconf 2.61. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -10,7 +10,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; } else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -233,7 +237,6 @@ IFS=$as_save_IFS # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : _ASEOF @@ -253,7 +258,6 @@ _ASEOF CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : (as_func_return () { @@ -512,19 +518,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -647,8 +662,10 @@ host_vendor host_os LIBRPATHX LTLIBRPATHX +LIBRPATHX_PREFIX LIBRPATHY LTLIBRPATHY +LIBRPATHY_PREFIX global_top_auxdir LIBOBJS LTLIBOBJS' @@ -659,6 +676,7 @@ target_alias CC CFLAGS LDFLAGS +LIBS CPPFLAGS' @@ -765,10 +783,10 @@ do -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -784,10 +802,10 @@ do -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -981,19 +999,19 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=no ;; --x) @@ -1255,6 +1273,7 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory @@ -1322,7 +1341,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1336,7 +1355,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1749,7 +1768,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1877,7 +1896,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -1930,7 +1949,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2069,7 +2088,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2109,7 +2128,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2185,7 +2204,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2225,7 +2244,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2282,7 +2301,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2323,7 +2342,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2381,7 +2400,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2425,7 +2444,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2566,7 +2585,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2594,6 +2613,12 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2605,8 +2630,6 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -2784,27 +2807,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -2859,27 +2865,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -2914,27 +2903,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -2970,27 +2942,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3106,27 +3061,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -3565,12 +3503,14 @@ fi { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then enableval=$enable_rpath; : @@ -3612,6 +3552,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -3656,6 +3597,7 @@ fi LIBRPATHX= LTLIBRPATHX= INCRPATHX= + LIBRPATHX_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -3689,27 +3631,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -3727,26 +3692,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -3772,10 +3753,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" haveit= for x in $rpathdirs; do @@ -3807,7 +3788,7 @@ fi if test -z "$haveit"; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" else LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name" @@ -3826,6 +3807,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHX_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -3976,21 +3958,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$flag" done @@ -4005,6 +3987,7 @@ fi ac_cv_librpathx_libs="$LIBRPATHX" ac_cv_librpathx_ltlibs="$LTLIBRPATHX" ac_cv_librpathx_cppflags="$INCRPATHX" + ac_cv_librpathx_prefix="$LIBRPATHX_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathx_libs" >&5 @@ -4012,6 +3995,7 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6; } LIBRPATHX="$ac_cv_librpathx_libs" LTLIBRPATHX="$ac_cv_librpathx_ltlibs" INCRPATHX="$ac_cv_librpathx_cppflags" + LIBRPATHX_PREFIX="$ac_cv_librpathx_prefix" for element in $INCRPATHX; do haveit= @@ -4037,6 +4021,7 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6; } + HAVE_LIBRPATHX=yes @@ -4055,6 +4040,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -4099,6 +4085,7 @@ fi LIBRPATHY= LTLIBRPATHY= INCRPATHY= + LIBRPATHY_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -4132,27 +4119,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -4170,26 +4180,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -4215,10 +4241,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" haveit= for x in $rpathdirs; do @@ -4250,7 +4276,7 @@ fi if test -z "$haveit"; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" else LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-l$name" @@ -4269,6 +4295,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHY_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -4419,21 +4446,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$flag" done @@ -4448,6 +4475,7 @@ fi ac_cv_librpathy_libs="$LIBRPATHY" ac_cv_librpathy_ltlibs="$LTLIBRPATHY" ac_cv_librpathy_cppflags="$INCRPATHY" + ac_cv_librpathy_prefix="$LIBRPATHY_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathy_libs" >&5 @@ -4455,6 +4483,7 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6; } LIBRPATHY="$ac_cv_librpathy_libs" LTLIBRPATHY="$ac_cv_librpathy_ltlibs" INCRPATHY="$ac_cv_librpathy_cppflags" + LIBRPATHY_PREFIX="$ac_cv_librpathy_prefix" for element in $INCRPATHY; do haveit= @@ -4480,6 +4509,7 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6; } + HAVE_LIBRPATHY=yes @@ -4652,7 +4682,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -4661,10 +4692,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -4888,19 +4922,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -4916,7 +4959,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4944,7 +4987,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -4963,7 +5006,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -5215,14 +5258,16 @@ host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim LIBRPATHX!$LIBRPATHX$ac_delim LTLIBRPATHX!$LTLIBRPATHX$ac_delim +LIBRPATHX_PREFIX!$LIBRPATHX_PREFIX$ac_delim LIBRPATHY!$LIBRPATHY$ac_delim LTLIBRPATHY!$LTLIBRPATHY$ac_delim +LIBRPATHY_PREFIX!$LIBRPATHY_PREFIX$ac_delim global_top_auxdir!$global_top_auxdir$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/autoconf-lib-link/tests/rpathlz/Makefile.in b/autoconf-lib-link/tests/rpathlz/Makefile.in index 926953c72..07e0f035e 100644 --- a/autoconf-lib-link/tests/rpathlz/Makefile.in +++ b/autoconf-lib-link/tests/rpathlz/Makefile.in @@ -45,9 +45,10 @@ DIST_COMMON = $(am__configure_deps) \ $(top_srcdir)/configure ../../../build-aux/compile \ ../../../build-aux/config.guess \ ../../../build-aux/config.rpath ../../../build-aux/config.sub \ - ../../../build-aux/elisp-comp ../../../build-aux/install-sh \ - ../../../build-aux/ltmain.sh ../../../build-aux/mdate-sh \ - ../../../build-aux/missing ../../../build-aux/mkinstalldirs \ + ../../../build-aux/depcomp ../../../build-aux/elisp-comp \ + ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \ + ../../../build-aux/mdate-sh ../../../build-aux/missing \ + ../../../build-aux/mkinstalldirs \ ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -112,6 +113,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBRPATHZ = @LIBRPATHZ@ +LIBRPATHZ_PREFIX = @LIBRPATHZ_PREFIX@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ LTLIBRPATHZ = @LTLIBRPATHZ@ diff --git a/autoconf-lib-link/tests/rpathlz/configure b/autoconf-lib-link/tests/rpathlz/configure index cb8deed96..500ea1be1 100755 --- a/autoconf-lib-link/tests/rpathlz/configure +++ b/autoconf-lib-link/tests/rpathlz/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60. +# Generated by GNU Autoconf 2.61. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -10,7 +10,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; } else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -233,7 +237,6 @@ IFS=$as_save_IFS # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : _ASEOF @@ -253,7 +258,6 @@ _ASEOF CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : (as_func_return () { @@ -512,19 +518,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -647,6 +662,7 @@ host_vendor host_os LIBRPATHZ LTLIBRPATHZ +LIBRPATHZ_PREFIX global_top_auxdir LIBOBJS LTLIBOBJS' @@ -657,6 +673,7 @@ target_alias CC CFLAGS LDFLAGS +LIBS CPPFLAGS' @@ -763,10 +780,10 @@ do -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -782,10 +799,10 @@ do -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -979,19 +996,19 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=no ;; --x) @@ -1251,6 +1268,7 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory @@ -1318,7 +1336,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1332,7 +1350,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1745,7 +1763,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1873,7 +1891,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -1926,7 +1944,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2065,7 +2083,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2105,7 +2123,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2181,7 +2199,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2221,7 +2239,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2278,7 +2296,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2319,7 +2337,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2377,7 +2395,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2421,7 +2439,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2562,7 +2580,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2590,6 +2608,12 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2601,8 +2625,6 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -2780,27 +2802,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -2855,27 +2860,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -2910,27 +2898,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -2966,27 +2937,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3102,27 +3056,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -3561,12 +3498,14 @@ fi { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then enableval=$enable_rpath; : @@ -3608,6 +3547,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -3652,6 +3592,7 @@ fi LIBRPATHZ= LTLIBRPATHZ= INCRPATHZ= + LIBRPATHZ_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -3685,27 +3626,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -3723,26 +3687,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -3768,10 +3748,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$found_so" haveit= for x in $rpathdirs; do @@ -3803,7 +3783,7 @@ fi if test -z "$haveit"; then LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$found_so" else LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }-l$name" @@ -3822,6 +3802,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHZ_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -3972,21 +3953,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$flag" done @@ -4001,6 +3982,7 @@ fi ac_cv_librpathz_libs="$LIBRPATHZ" ac_cv_librpathz_ltlibs="$LTLIBRPATHZ" ac_cv_librpathz_cppflags="$INCRPATHZ" + ac_cv_librpathz_prefix="$LIBRPATHZ_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathz_libs" >&5 @@ -4008,6 +3990,7 @@ echo "${ECHO_T}$ac_cv_librpathz_libs" >&6; } LIBRPATHZ="$ac_cv_librpathz_libs" LTLIBRPATHZ="$ac_cv_librpathz_ltlibs" INCRPATHZ="$ac_cv_librpathz_cppflags" + LIBRPATHZ_PREFIX="$ac_cv_librpathz_prefix" for element in $INCRPATHZ; do haveit= @@ -4033,6 +4016,7 @@ echo "${ECHO_T}$ac_cv_librpathz_libs" >&6; } + HAVE_LIBRPATHZ=yes @@ -4204,7 +4188,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -4213,10 +4198,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -4440,19 +4428,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -4468,7 +4465,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4496,7 +4493,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -4515,7 +4512,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -4767,12 +4764,13 @@ host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim LIBRPATHZ!$LIBRPATHZ$ac_delim LTLIBRPATHZ!$LTLIBRPATHZ$ac_delim +LIBRPATHZ_PREFIX!$LIBRPATHZ_PREFIX$ac_delim global_top_auxdir!$global_top_auxdir$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/autoconf-lib-link/tests/rpathlzyx/Makefile.in b/autoconf-lib-link/tests/rpathlzyx/Makefile.in index 4e1fdce0a..f742b51ae 100644 --- a/autoconf-lib-link/tests/rpathlzyx/Makefile.in +++ b/autoconf-lib-link/tests/rpathlzyx/Makefile.in @@ -45,9 +45,10 @@ DIST_COMMON = $(am__configure_deps) \ $(top_srcdir)/configure ../../../build-aux/compile \ ../../../build-aux/config.guess \ ../../../build-aux/config.rpath ../../../build-aux/config.sub \ - ../../../build-aux/elisp-comp ../../../build-aux/install-sh \ - ../../../build-aux/ltmain.sh ../../../build-aux/mdate-sh \ - ../../../build-aux/missing ../../../build-aux/mkinstalldirs \ + ../../../build-aux/depcomp ../../../build-aux/elisp-comp \ + ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \ + ../../../build-aux/mdate-sh ../../../build-aux/missing \ + ../../../build-aux/mkinstalldirs \ ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -112,8 +113,11 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBRPATHX = @LIBRPATHX@ +LIBRPATHX_PREFIX = @LIBRPATHX_PREFIX@ LIBRPATHY = @LIBRPATHY@ +LIBRPATHY_PREFIX = @LIBRPATHY_PREFIX@ LIBRPATHZ = @LIBRPATHZ@ +LIBRPATHZ_PREFIX = @LIBRPATHZ_PREFIX@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ LTLIBRPATHX = @LTLIBRPATHX@ diff --git a/autoconf-lib-link/tests/rpathlzyx/configure b/autoconf-lib-link/tests/rpathlzyx/configure index babb4b7d7..45f4c5221 100755 --- a/autoconf-lib-link/tests/rpathlzyx/configure +++ b/autoconf-lib-link/tests/rpathlzyx/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60. +# Generated by GNU Autoconf 2.61. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -10,7 +10,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; } else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -233,7 +237,6 @@ IFS=$as_save_IFS # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : _ASEOF @@ -253,7 +258,6 @@ _ASEOF CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : (as_func_return () { @@ -512,19 +518,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -647,10 +662,13 @@ host_vendor host_os LIBRPATHX LTLIBRPATHX +LIBRPATHX_PREFIX LIBRPATHY LTLIBRPATHY +LIBRPATHY_PREFIX LIBRPATHZ LTLIBRPATHZ +LIBRPATHZ_PREFIX global_top_auxdir LIBOBJS LTLIBOBJS' @@ -661,6 +679,7 @@ target_alias CC CFLAGS LDFLAGS +LIBS CPPFLAGS' @@ -767,10 +786,10 @@ do -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -786,10 +805,10 @@ do -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -983,19 +1002,19 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=no ;; --x) @@ -1259,6 +1278,7 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory @@ -1326,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1340,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1753,7 +1773,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1881,7 +1901,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -1934,7 +1954,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2073,7 +2093,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2113,7 +2133,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2189,7 +2209,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2229,7 +2249,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2286,7 +2306,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2327,7 +2347,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2385,7 +2405,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2429,7 +2449,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2570,7 +2590,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2598,6 +2618,12 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2609,8 +2635,6 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -2788,27 +2812,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -2863,27 +2870,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -2918,27 +2908,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -2974,27 +2947,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3110,27 +3066,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -3569,12 +3508,14 @@ fi { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then enableval=$enable_rpath; : @@ -3616,6 +3557,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -3660,6 +3602,7 @@ fi LIBRPATHX= LTLIBRPATHX= INCRPATHX= + LIBRPATHX_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -3693,27 +3636,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -3731,26 +3697,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -3776,10 +3758,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" haveit= for x in $rpathdirs; do @@ -3811,7 +3793,7 @@ fi if test -z "$haveit"; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" else LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name" @@ -3830,6 +3812,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHX_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -3980,21 +3963,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$flag" done @@ -4009,6 +3992,7 @@ fi ac_cv_librpathx_libs="$LIBRPATHX" ac_cv_librpathx_ltlibs="$LTLIBRPATHX" ac_cv_librpathx_cppflags="$INCRPATHX" + ac_cv_librpathx_prefix="$LIBRPATHX_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathx_libs" >&5 @@ -4016,6 +4000,7 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6; } LIBRPATHX="$ac_cv_librpathx_libs" LTLIBRPATHX="$ac_cv_librpathx_ltlibs" INCRPATHX="$ac_cv_librpathx_cppflags" + LIBRPATHX_PREFIX="$ac_cv_librpathx_prefix" for element in $INCRPATHX; do haveit= @@ -4041,6 +4026,7 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6; } + HAVE_LIBRPATHX=yes @@ -4059,6 +4045,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -4103,6 +4090,7 @@ fi LIBRPATHY= LTLIBRPATHY= INCRPATHY= + LIBRPATHY_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -4136,27 +4124,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -4174,26 +4185,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -4219,10 +4246,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" haveit= for x in $rpathdirs; do @@ -4254,7 +4281,7 @@ fi if test -z "$haveit"; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" else LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-l$name" @@ -4273,6 +4300,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHY_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -4423,21 +4451,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$flag" done @@ -4452,6 +4480,7 @@ fi ac_cv_librpathy_libs="$LIBRPATHY" ac_cv_librpathy_ltlibs="$LTLIBRPATHY" ac_cv_librpathy_cppflags="$INCRPATHY" + ac_cv_librpathy_prefix="$LIBRPATHY_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathy_libs" >&5 @@ -4459,6 +4488,7 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6; } LIBRPATHY="$ac_cv_librpathy_libs" LTLIBRPATHY="$ac_cv_librpathy_ltlibs" INCRPATHY="$ac_cv_librpathy_cppflags" + LIBRPATHY_PREFIX="$ac_cv_librpathy_prefix" for element in $INCRPATHY; do haveit= @@ -4484,6 +4514,7 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6; } + HAVE_LIBRPATHY=yes @@ -4502,6 +4533,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -4546,6 +4578,7 @@ fi LIBRPATHZ= LTLIBRPATHZ= INCRPATHZ= + LIBRPATHZ_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -4579,27 +4612,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -4617,26 +4673,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -4662,10 +4734,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$found_so" haveit= for x in $rpathdirs; do @@ -4697,7 +4769,7 @@ fi if test -z "$haveit"; then LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$found_so" else LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }-l$name" @@ -4716,6 +4788,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHZ_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -4866,21 +4939,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$flag" done @@ -4895,6 +4968,7 @@ fi ac_cv_librpathz_libs="$LIBRPATHZ" ac_cv_librpathz_ltlibs="$LTLIBRPATHZ" ac_cv_librpathz_cppflags="$INCRPATHZ" + ac_cv_librpathz_prefix="$LIBRPATHZ_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathz_libs" >&5 @@ -4902,6 +4976,7 @@ echo "${ECHO_T}$ac_cv_librpathz_libs" >&6; } LIBRPATHZ="$ac_cv_librpathz_libs" LTLIBRPATHZ="$ac_cv_librpathz_ltlibs" INCRPATHZ="$ac_cv_librpathz_cppflags" + LIBRPATHZ_PREFIX="$ac_cv_librpathz_prefix" for element in $INCRPATHZ; do haveit= @@ -4927,6 +5002,7 @@ echo "${ECHO_T}$ac_cv_librpathz_libs" >&6; } + HAVE_LIBRPATHZ=yes @@ -5099,7 +5175,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -5108,10 +5185,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -5335,19 +5415,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -5363,7 +5452,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5391,7 +5480,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -5410,7 +5499,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -5662,16 +5751,19 @@ host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim LIBRPATHX!$LIBRPATHX$ac_delim LTLIBRPATHX!$LTLIBRPATHX$ac_delim +LIBRPATHX_PREFIX!$LIBRPATHX_PREFIX$ac_delim LIBRPATHY!$LIBRPATHY$ac_delim LTLIBRPATHY!$LTLIBRPATHY$ac_delim +LIBRPATHY_PREFIX!$LIBRPATHY_PREFIX$ac_delim LIBRPATHZ!$LIBRPATHZ$ac_delim LTLIBRPATHZ!$LTLIBRPATHZ$ac_delim +LIBRPATHZ_PREFIX!$LIBRPATHZ_PREFIX$ac_delim global_top_auxdir!$global_top_auxdir$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/autoconf-lib-link/tests/rpathx/Makefile.in b/autoconf-lib-link/tests/rpathx/Makefile.in index a3a07bbeb..9a45247ee 100644 --- a/autoconf-lib-link/tests/rpathx/Makefile.in +++ b/autoconf-lib-link/tests/rpathx/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -36,6 +32,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = $(am__configure_deps) \ $(srcdir)/../../../build-aux/config.guess \ $(srcdir)/../../../build-aux/config.sub \ @@ -47,17 +44,17 @@ DIST_COMMON = $(am__configure_deps) \ $(top_srcdir)/configure ../../../build-aux/compile \ ../../../build-aux/config.guess \ ../../../build-aux/config.rpath ../../../build-aux/config.sub \ - ../../../build-aux/elisp-comp ../../../build-aux/install-sh \ - ../../../build-aux/ltmain.sh ../../../build-aux/mdate-sh \ - ../../../build-aux/missing ../../../build-aux/mkinstalldirs \ + ../../../build-aux/depcomp ../../../build-aux/elisp-comp \ + ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \ + ../../../build-aux/mdate-sh ../../../build-aux/missing \ + ../../../build-aux/mkinstalldirs \ ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(SHELL) \ $(top_srcdir)/../../../build-aux/mkinstalldirs CONFIG_CLEAN_FILES = @@ -73,17 +70,21 @@ LTLIBRARIES = $(lib_LTLIBRARIES) librpathx_la_LIBADD = am_librpathx_la_OBJECTS = rpathx.lo librpathx_la_OBJECTS = $(am_librpathx_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) +librpathx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(librpathx_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(librpathx_la_SOURCES) DIST_SOURCES = $(librpathx_la_SOURCES) ETAGS = etags @@ -100,8 +101,6 @@ GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -128,6 +127,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -139,6 +140,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -148,20 +150,18 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -173,7 +173,11 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ global_top_auxdir = @global_top_auxdir@ host = @host@ @@ -181,21 +185,28 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies lib_LTLIBRARIES = librpathx.la librpathx_la_SOURCES = rpathx.c @@ -239,7 +250,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ @@ -250,7 +261,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ @@ -265,7 +276,7 @@ clean-libLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done librpathx.la: $(librpathx_la_OBJECTS) $(librpathx_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(librpathx_la_LDFLAGS) $(librpathx_la_OBJECTS) $(librpathx_la_LIBADD) $(LIBS) + $(librpathx_la_LINK) -rpath $(libdir) $(librpathx_la_OBJECTS) $(librpathx_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -290,7 +301,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -342,24 +352,22 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/../../../build-aux - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -373,7 +381,7 @@ distdir: $(DISTFILES) -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -448,7 +456,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -472,7 +480,7 @@ check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -521,12 +529,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: install-libLTLIBRARIES +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -548,7 +564,9 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES +uninstall-am: uninstall-libLTLIBRARIES + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \ @@ -556,14 +574,15 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES distcheck distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-strip installcheck \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-libLTLIBRARIES + tags uninstall uninstall-am uninstall-libLTLIBRARIES # 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. diff --git a/autoconf-lib-link/tests/rpathx/configure b/autoconf-lib-link/tests/rpathx/configure index b06954141..daa873b37 100755 --- a/autoconf-lib-link/tests/rpathx/configure +++ b/autoconf-lib-link/tests/rpathx/configure @@ -1,25 +1,54 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.61. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -29,8 +58,43 @@ else fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -44,18 +108,19 @@ do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -63,157 +128,388 @@ fi # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -222,7 +518,28 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -231,15 +548,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - # Check that we are running under the correct shell. @@ -395,29 +703,26 @@ tagnames=${tagnames+${tagnames},}CXX tagnames=${tagnames+${tagnames},}F77 +exec 7<&0 &1 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -429,42 +734,161 @@ ac_unique_file="configure.ac" # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL global_top_auxdir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +am__isrc +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +DEPDIR +am__include +am__quote +AMDEP_TRUE +AMDEP_FALSE +AMDEPBACKSLASH +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +SED +GREP +EGREP +LN_S +ECHO +AR +RANLIB +CPP +CXX +CXXFLAGS +ac_ct_CXX +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE +CXXCPP +F77 +FFLAGS +ac_ct_F77 +LIBTOOL +global_top_auxdir +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +F77 +FFLAGS' + # Initialize some variables set by options. ac_init_help= @@ -491,34 +915,48 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -540,33 +978,45 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -593,6 +1043,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -617,13 +1073,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -688,6 +1147,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -740,24 +1209,20 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -788,8 +1253,7 @@ Try \`$0 --help' for more information." >&2 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -809,27 +1273,19 @@ if test -n "$ac_prev"; then { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -856,94 +1312,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP -ac_env_F77_set=${F77+set} -ac_env_F77_value=$F77 -ac_cv_env_F77_set=${F77+set} -ac_cv_env_F77_value=$F77 -ac_env_FFLAGS_set=${FFLAGS+set} -ac_env_FFLAGS_value=$FFLAGS -ac_cv_env_FFLAGS_set=${FFLAGS+set} -ac_cv_env_FFLAGS_value=$FFLAGS + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -972,9 +1410,6 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -992,15 +1427,22 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1025,10 +1467,8 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] - build static libraries [default=yes] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -1039,16 +1479,16 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] - include additional configurations [automatic] + --with-tags[=TAGS] include additional configurations [automatic] Some influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags @@ -1060,118 +1500,86 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.61 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1190,7 +1598,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1204,6 +1612,7 @@ do test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1225,7 +1634,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1236,7 +1644,7 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1258,9 +1666,7 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1271,8 +1677,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1285,20 +1691,34 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1309,22 +1729,28 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1336,26 +1762,24 @@ _ASBOX ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1386,14 +1810,17 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1409,8 +1836,8 @@ if test -r "$cache_file"; then { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1422,12 +1849,11 @@ fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1452,8 +1878,7 @@ echo "$as_me: current value: $ac_new_val" >&2;} # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1470,12 +1895,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - @@ -1492,34 +1911,46 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= -for ac_dir in ../../../build-aux $srcdir/../../../build-aux; do - if test -f $ac_dir/install-sh; then +for ac_dir in ../../../build-aux "$srcdir"/../../../build-aux; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../../build-aux $srcdir/../../../build-aux" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in ../../../build-aux $srcdir/../../../build-aux" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../../build-aux \"$srcdir\"/../../../build-aux" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in ../../../build-aux \"$srcdir\"/../../../build-aux" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -am__api_version="1.9" +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +am__api_version='1.10' + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1533,8 +1964,8 @@ am__api_version="1.9" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1556,7 +1987,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1575,21 +2006,22 @@ case $as_dir/ in ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1599,8 +2031,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1642,20 +2074,20 @@ echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" + program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. echo might interpret backslashes. # By default was `s,x,x', remove it if useless. cat <<\_ACEOF >conftest.sed s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.sed # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1670,45 +2102,60 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" else - mkdir_p='$(install_sh) -d' + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" fi fi +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1721,54 +2168,57 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -1781,12 +2231,16 @@ else fi rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi fi # test whether we have cygpath @@ -1829,7 +2283,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -1839,8 +2293,8 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1853,32 +2307,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1891,33 +2347,47 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -1939,8 +2409,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1953,32 +2423,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1991,36 +2463,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2033,74 +2520,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + fi fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2114,7 +2561,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2125,6 +2572,7 @@ do fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -2142,22 +2590,23 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2170,36 +2619,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2212,29 +2663,45 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -2247,21 +2714,35 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -2286,47 +2767,77 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2338,19 +2849,21 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2369,22 +2882,27 @@ See \`config.log' for more details." >&2;} fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -2395,9 +2913,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac @@ -2411,14 +2928,14 @@ See \`config.log' for more details." >&2;} fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2438,14 +2955,20 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -2463,12 +2986,12 @@ fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2491,50 +3014,49 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2550,38 +3072,118 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -2597,12 +3199,12 @@ else CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2636,12 +3238,17 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2656,205 +3263,57 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2862,7 +3321,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu DEPDIR="${am__leading_dot}deps" - ac_config_commands="$ac_config_commands depfiles" +ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} @@ -2872,8 +3331,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } am__include="#" am__quote= _am_result=none @@ -2900,22 +3359,20 @@ if test "$am__include" = "#"; then fi -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } rm -f confinc confmf -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +# Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" + enableval=$enable_dependency_tracking; +fi -fi; if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - - -if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -2925,11 +3382,10 @@ fi - depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2993,6 +3449,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -3018,13 +3475,11 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -3035,10 +3490,9 @@ else fi -# Check whether --enable-shared or --disable-shared was given. +# Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; no) enable_shared=no ;; @@ -3057,12 +3511,12 @@ if test "${enable_shared+set}" = set; then esac else enable_shared=yes -fi; +fi + -# Check whether --enable-static or --disable-static was given. +# Check whether --enable-static was given. if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} + enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; no) enable_static=no ;; @@ -3081,12 +3535,12 @@ if test "${enable_static+set}" = set; then esac else enable_static=yes -fi; +fi + -# Check whether --enable-fast-install or --disable-fast-install was given. +# Check whether --enable-fast-install was given. if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} + enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; @@ -3105,64 +3559,94 @@ if test "${enable_fast_install+set}" = set; then esac else enable_fast_install=yes -fi; +fi + # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } if test "${lt_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3175,12 +3659,13 @@ do test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3215,37 +3700,185 @@ done fi SED=$lt_cv_path_SED -echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } + +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -3274,11 +3907,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3311,17 +3944,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3335,20 +3968,20 @@ case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -3365,8 +3998,8 @@ case $host_os in ;; esac -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3414,23 +4047,23 @@ else test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } NM="$lt_cv_path_NM" -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3471,16 +4104,22 @@ cygwin*) mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -3518,7 +4157,7 @@ hpux10.20* | hpux11*) esac ;; -interix3*) +interix[3-9]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ;; @@ -3534,7 +4173,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3568,6 +4207,10 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -3605,8 +4248,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) esac fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -3624,11 +4267,11 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"} compiler=$CC -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -3655,7 +4298,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3658 "configure"' > conftest.$ac_ext + echo '#line 4301 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3690,7 +4333,8 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -3701,6 +4345,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -3717,6 +4364,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -3740,8 +4390,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3767,35 +4417,32 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3804,8 +4451,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -3842,8 +4489,8 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3877,24 +4524,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -3903,9 +4548,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3915,24 +4561,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -3943,6 +4587,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3960,8 +4605,8 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3984,24 +4629,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -4010,9 +4653,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4022,24 +4666,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -4050,6 +4692,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -4072,8 +4715,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4097,35 +4740,31 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -4181,6 +4820,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -4200,18 +4840,27 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4224,12 +4873,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -4252,9 +4903,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -4268,38 +4919,35 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -4314,18 +4962,19 @@ done for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4336,41 +4985,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4379,24 +5024,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -4404,9 +5047,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -4430,25 +5074,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -4460,18 +5098,22 @@ fi done -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4484,36 +5126,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4526,55 +5170,85 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4597,50 +5271,49 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4656,160 +5329,134 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration -#include + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_ext=cc +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4817,8 +5464,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu depcc="$CXX" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4882,6 +5529,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -4907,13 +5555,11 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then am__fastdepCXX_TRUE= @@ -4929,13 +5575,13 @@ fi if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4965,24 +5611,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -4991,9 +5635,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5003,24 +5648,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5031,6 +5674,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5048,8 +5692,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -5072,24 +5716,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -5098,9 +5740,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5110,24 +5753,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5138,6 +5779,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5153,7 +5795,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5167,12 +5809,12 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5185,36 +5827,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6 + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$F77" && break done fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5227,48 +5871,78 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_F77" && break done - F77=$ac_ct_F77 + if test "x$ac_ct_F77" = x; then + F77="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + F77=$ac_ct_F77 + fi fi # Provide some information about the compiler. -echo "$as_me:5257:" \ - "checking for Fortran 77 compiler version" >&5 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -5278,8 +5952,8 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } if test "${ac_cv_f77_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5292,46 +5966,42 @@ else end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_f77_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5342,39 +6012,35 @@ cat >conftest.$ac_ext <<_ACEOF end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_f77_g=no + ac_cv_prog_f77_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -5403,8 +6069,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } if test "${lt_cv_sys_max_cmd_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5488,43 +6154,47 @@ else fi ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac fi if test -n $lt_cv_sys_max_cmd_len ; then - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } else - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } fi + # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5559,7 +6229,7 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) +linux* | k*bsd*-gnu) if test "$host_cpu" = ia64; then symcode='[ABCDGIRSTW]' lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -5728,15 +6398,15 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } fi -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } if test "${lt_cv_objdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5750,8 +6420,8 @@ else fi rmdir .libs 2>/dev/null fi -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -5802,8 +6472,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5816,32 +6486,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5854,27 +6526,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AR=$ac_ct_AR + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi else AR="$ac_cv_prog_AR" fi @@ -5882,8 +6568,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5896,32 +6582,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5934,27 +6622,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -5962,8 +6664,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5976,32 +6678,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6014,27 +6718,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -6062,7 +6780,7 @@ test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -6093,8 +6811,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6146,17 +6864,17 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6208,11 +6926,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi else @@ -6227,21 +6945,21 @@ esac enable_dlopen=no enable_win32_dll=no -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Check whether --with-pic or --without-pic was given. +# Check whether --with-pic was given. if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" + withval=$with_pic; pic_mode="$withval" else pic_mode=default -fi; +fi + test -z "$pic_mode" && pic_mode=default # Use C for the default configuration in the libtool script @@ -6262,10 +6980,10 @@ objext=o objext=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' # If no C compiler was specified, use CC. @@ -6280,13 +6998,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -6299,14 +7017,14 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -6317,11 +7035,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6320: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7038: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6324: \$? = $ac_status" >&5 + echo "$as_me:7042: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6334,8 +7052,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -6349,8 +7067,8 @@ lt_prog_compiler_wl= lt_prog_compiler_pic= lt_prog_compiler_static= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -6390,7 +7108,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -6451,8 +7169,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' ;; @@ -6483,7 +7199,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl='-Wl,' @@ -6530,6 +7246,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static='-non_shared' ;; + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + solaris*) lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -6582,22 +7302,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -6608,11 +7328,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6611: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7331: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6615: \$? = $ac_status" >&5 + echo "$as_me:7335: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6625,8 +7345,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } if test x"$lt_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -6653,15 +7373,15 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6681,8 +7401,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } if test x"$lt_prog_compiler_static_works" = xyes; then : @@ -6691,8 +7411,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6701,7 +7421,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -6712,11 +7432,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6715: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7435: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6719: \$? = $ac_status" >&5 + echo "$as_me:7439: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -6738,23 +7458,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -6764,8 +7484,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag= @@ -6908,7 +7628,7 @@ EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -6926,7 +7646,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' @@ -6941,7 +7661,7 @@ EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -6961,7 +7681,7 @@ EOF esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; @@ -7133,7 +7853,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct=yes + : else # We have old collect2 hardcode_direct=unsupported @@ -7189,39 +7909,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -7250,39 +7975,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -7328,7 +8058,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes=yes ;; @@ -7370,10 +8100,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -7413,7 +8143,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -7535,24 +8265,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs=no fi ;; @@ -7611,17 +8345,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs=yes ;; @@ -7678,7 +8411,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag='${wl}-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no @@ -7731,8 +8464,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no # @@ -7752,10 +8485,10 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -7790,16 +8523,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -7813,17 +8546,55 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" + if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -7983,12 +8754,8 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -8005,18 +8772,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -8054,7 +8809,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -8117,7 +8872,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -8172,7 +8927,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -8188,7 +8943,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -8201,18 +8956,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -8294,6 +9037,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -8386,8 +9133,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -8395,8 +9142,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ @@ -8420,8 +9167,8 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6; } if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -8434,29 +9181,30 @@ fi striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + old_striplib="$STRIP -S" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ;; *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -8488,8 +9236,8 @@ else darwin*) # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8502,56 +9250,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -8565,8 +9310,8 @@ fi ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8593,73 +9338,64 @@ cat >>conftest.$ac_ext <<_ACEOF #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shl_load=no + ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8672,61 +9408,58 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8753,73 +9486,64 @@ cat >>conftest.$ac_ext <<_ACEOF #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_dlopen=no + ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8832,61 +9556,58 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8899,61 +9620,58 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8966,56 +9684,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -9055,8 +9770,8 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9066,7 +9781,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9166,7 +9881,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -9273,13 +9988,13 @@ fi # Report which library types will actually be built -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -9299,15 +10014,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -9364,6 +10079,7 @@ if test -f "$ltmain"; then module_cmds \ module_expsym_cmds \ lt_cv_prog_compiler_c_o \ + fix_srcfile_path \ exclude_expsyms \ include_expsyms; do @@ -9408,7 +10124,7 @@ echo "$as_me: creating $ofile" >&6;} # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -9732,7 +10448,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols @@ -9799,11 +10515,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC="$lt_save_CC" -# Check whether --with-tags or --without-tags was given. +# Check whether --with-tags was given. if test "${with_tags+set}" = set; then - withval="$with_tags" - tagnames="$withval" -fi; + withval=$with_tags; tagnames="$withval" +fi + if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -9857,7 +10573,7 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -9901,10 +10617,10 @@ objext=o objext_CXX=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -9920,13 +10636,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -9976,18 +10692,18 @@ if test "$GXX" = yes; then # Set up default GNU C++ configuration -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -10016,11 +10732,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10053,17 +10769,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10077,8 +10793,8 @@ case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -10128,8 +10844,8 @@ else fi # PORTME: fill in a description of your system's C++ link characteristics -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -10185,7 +10901,7 @@ case $host_os in strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_CXX=yes + : else # We have old collect2 hardcode_direct_CXX=unsupported @@ -10241,39 +10957,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10303,39 +11024,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10446,10 +11172,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -10483,7 +11209,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -10532,9 +11258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator_CXX=: case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_CXX='+b $libdir' - ;; + hppa*64*|ia64*) ;; *) export_dynamic_flag_spec_CXX='${wl}-E' ;; @@ -10602,7 +11326,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - interix3*) + interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' @@ -10642,7 +11366,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -10783,16 +11507,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; openbsd*) - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + else + ld_shlibs_CXX=no fi - output_verbose_link_cmd='echo' ;; osf3*) case $cc_basename in @@ -10954,15 +11682,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs_CXX=yes @@ -11009,6 +11732,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac @@ -11089,8 +11818,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" @@ -11200,7 +11929,7 @@ $rm -f confest.$objext # PORTME: override above test on systems where it is broken case $host_os in -interix3*) +interix[3-9]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. predep_objects_CXX= @@ -11212,7 +11941,19 @@ linux*) case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 - postdeps_CXX='-lCstd -lCrun' + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -11220,10 +11961,22 @@ linux*) solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - postdeps_CXX='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -11238,8 +11991,8 @@ lt_prog_compiler_wl_CXX= lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -11279,7 +12032,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -11345,7 +12098,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -11388,7 +12141,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -11522,22 +12275,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -11548,11 +12301,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11551: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12304: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11555: \$? = $ac_status" >&5 + echo "$as_me:12308: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11565,8 +12318,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in @@ -11593,15 +12346,15 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11621,8 +12374,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } if test x"$lt_prog_compiler_static_works_CXX" = xyes; then : @@ -11631,8 +12384,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11641,7 +12394,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -11652,11 +12405,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11655: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12408: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11659: \$? = $ac_status" >&5 + echo "$as_me:12412: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11678,23 +12431,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -11704,8 +12457,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -11722,15 +12475,15 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no # @@ -11750,10 +12503,10 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -11788,16 +12541,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -11811,20 +12564,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -11981,12 +12721,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -12003,18 +12738,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -12052,7 +12775,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -12115,7 +12838,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -12170,7 +12893,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -12186,7 +12909,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -12199,18 +12922,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -12292,6 +13003,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -12384,8 +13099,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -12393,8 +13108,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ @@ -12418,8 +13133,8 @@ else # directories. hardcode_action_CXX=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported @@ -12486,6 +13201,7 @@ if test -f "$ltmain"; then module_cmds_CXX \ module_expsym_cmds_CXX \ lt_cv_prog_compiler_c_o_CXX \ + fix_srcfile_path_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX; do @@ -12806,7 +13522,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_CXX" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -12897,10 +13613,17 @@ objext=o objext_F77=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -12916,13 +13639,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -12944,13 +13667,13 @@ done cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -12969,15 +13692,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } GCC_F77="$G77" LD_F77="$LD" @@ -12986,8 +13709,8 @@ lt_prog_compiler_wl_F77= lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' @@ -13027,7 +13750,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic_F77='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -13088,8 +13811,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries lt_prog_compiler_pic_F77='-DDLL_EXPORT' ;; @@ -13120,7 +13841,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_F77='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' @@ -13167,6 +13888,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_F77='-non_shared' ;; + rdos*) + lt_prog_compiler_static_F77='-non_shared' + ;; + solaris*) lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -13219,22 +13944,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -13245,11 +13970,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13248: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13973: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13252: \$? = $ac_status" >&5 + echo "$as_me:13977: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13262,8 +13987,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } if test x"$lt_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in @@ -13290,15 +14015,15 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13318,8 +14043,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } if test x"$lt_prog_compiler_static_works_F77" = xyes; then : @@ -13328,8 +14053,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13338,7 +14063,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -13349,11 +14074,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13352: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14077: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13356: \$? = $ac_status" >&5 + echo "$as_me:14081: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13375,23 +14100,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -13401,8 +14126,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_F77= @@ -13545,7 +14270,7 @@ EOF allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -13563,7 +14288,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct_F77=no hardcode_shlibpath_var_F77=no hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' @@ -13578,7 +14303,7 @@ EOF archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -13598,7 +14323,7 @@ EOF esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null' + whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; @@ -13770,7 +14495,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_F77=yes + : else # We have old collect2 hardcode_direct_F77=unsupported @@ -13816,39 +14541,44 @@ _LT_EOF end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -13867,39 +14597,44 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -13945,7 +14680,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path_F77='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; @@ -13987,10 +14722,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -14030,7 +14765,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -14152,24 +14887,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + ;; + *) + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_F77=no fi ;; @@ -14228,17 +14967,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_F77=yes ;; @@ -14295,7 +15033,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag_F77='${wl}-z,text' archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no @@ -14348,8 +15086,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +echo "${ECHO_T}$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no # @@ -14369,10 +15107,10 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -14407,16 +15145,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -14430,20 +15168,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -14600,12 +15325,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -14622,18 +15342,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -14671,7 +15379,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -14734,7 +15442,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -14789,7 +15497,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -14805,7 +15513,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -14818,18 +15526,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -14911,6 +15607,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -15003,8 +15703,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -15012,8 +15712,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var_F77" || \ @@ -15037,8 +15737,8 @@ else # directories. hardcode_action_F77=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6; } if test "$hardcode_action_F77" = relink; then # Fast installation is not supported @@ -15105,6 +15805,7 @@ if test -f "$ltmain"; then module_cmds_F77 \ module_expsym_cmds_F77 \ lt_cv_prog_compiler_c_o_F77 \ + fix_srcfile_path_F77 \ exclude_expsyms_F77 \ include_expsyms_F77; do @@ -15425,7 +16126,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_F77" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_F77 @@ -15475,7 +16176,6 @@ CC="$lt_save_CC" if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - # Source file extension for Java test sources. ac_ext=java @@ -15484,10 +16184,10 @@ objext=o objext_GCJ=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -15503,13 +16203,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -15543,14 +16243,14 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -15561,11 +16261,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15564: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16264: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15568: \$? = $ac_status" >&5 + echo "$as_me:16268: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15578,8 +16278,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" @@ -15593,8 +16293,8 @@ lt_prog_compiler_wl_GCJ= lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' @@ -15634,7 +16334,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic_GCJ='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -15695,8 +16395,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ;; @@ -15727,7 +16425,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_GCJ='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' @@ -15774,6 +16472,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_GCJ='-non_shared' ;; + rdos*) + lt_prog_compiler_static_GCJ='-non_shared' + ;; + solaris*) lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -15826,22 +16528,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -15852,11 +16554,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15855: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16557: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15859: \$? = $ac_status" >&5 + echo "$as_me:16561: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15869,8 +16571,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in @@ -15897,15 +16599,15 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15925,8 +16627,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then : @@ -15935,8 +16637,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15945,7 +16647,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -15956,11 +16658,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15959: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16661: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15963: \$? = $ac_status" >&5 + echo "$as_me:16665: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15982,23 +16684,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -16008,8 +16710,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_GCJ= @@ -16152,7 +16854,7 @@ EOF allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -16170,7 +16872,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' @@ -16185,7 +16887,7 @@ EOF archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -16205,7 +16907,7 @@ EOF esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null' + whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; @@ -16377,7 +17079,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_GCJ=yes + : else # We have old collect2 hardcode_direct_GCJ=unsupported @@ -16433,39 +17135,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16494,39 +17201,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16572,7 +17284,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; @@ -16614,10 +17326,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -16657,7 +17369,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -16779,24 +17491,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + ;; + *) + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - ;; - *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_GCJ=no fi ;; @@ -16855,17 +17571,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_GCJ=yes ;; @@ -16922,7 +17637,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag_GCJ='${wl}-z,text' archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no @@ -16975,8 +17690,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } test "$ld_shlibs_GCJ" = no && can_build_shared=no # @@ -16996,10 +17711,10 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -17034,16 +17749,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -17057,20 +17772,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -17227,12 +17929,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -17249,18 +17946,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -17298,7 +17983,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -17361,7 +18046,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -17416,7 +18101,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -17432,7 +18117,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -17445,18 +18130,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -17538,6 +18211,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -17630,8 +18307,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -17639,8 +18316,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ test -n "$runpath_var_GCJ" || \ @@ -17664,8 +18341,8 @@ else # directories. hardcode_action_GCJ=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } if test "$hardcode_action_GCJ" = relink; then # Fast installation is not supported @@ -17732,6 +18409,7 @@ if test -f "$ltmain"; then module_cmds_GCJ \ module_expsym_cmds_GCJ \ lt_cv_prog_compiler_c_o_GCJ \ + fix_srcfile_path_GCJ \ exclude_expsyms_GCJ \ include_expsyms_GCJ; do @@ -18052,7 +18730,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_GCJ" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_GCJ @@ -18101,7 +18779,6 @@ CC="$lt_save_CC" RC) - # Source file extension for RC test sources. ac_ext=rc @@ -18110,7 +18787,7 @@ objext=o objext_RC=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -18129,13 +18806,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -18213,6 +18890,7 @@ if test -f "$ltmain"; then module_cmds_RC \ module_expsym_cmds_RC \ lt_cv_prog_compiler_c_o_RC \ + fix_srcfile_path_RC \ exclude_expsyms_RC \ include_expsyms_RC; do @@ -18533,7 +19211,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_RC" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_RC @@ -18633,7 +19311,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' - ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -18652,39 +19331,58 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -18693,63 +19391,48 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. # # If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, +# take arguments), then branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF +ac_script=' t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.h` ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -18801,17 +19484,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -18821,8 +19532,43 @@ else fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -18836,18 +19582,19 @@ do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -18855,159 +19602,120 @@ fi # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -19016,7 +19724,28 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -19025,31 +19754,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -19057,30 +19769,19 @@ generated by GNU Autoconf 2.59. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_commands="$ac_config_commands" -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -19088,7 +19789,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -19102,19 +19803,22 @@ Configuration commands: $config_commands Report bugs to ." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -19125,60 +19829,42 @@ while test $# != 0 do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -19194,36 +19880,48 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF # -# INIT-COMMANDS section. +# INIT-COMMANDS # - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + case $ac_config_target in + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -19234,352 +19932,465 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - # -# CONFIG_FILES section. +# Set up the sed scripts for CONFIG_FILES section. # # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t -s,@AMTAR@,$AMTAR,;t t -s,@am__tar@,$am__tar,;t t -s,@am__untar@,$am__untar,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@EGREP@,$EGREP,;t t -s,@LN_S@,$LN_S,;t t -s,@ECHO@,$ECHO,;t t -s,@AR@,$AR,;t t -s,@ac_ct_AR@,$ac_ct_AR,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@CPP@,$CPP,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@F77@,$F77,;t t -s,@FFLAGS@,$FFLAGS,;t t -s,@ac_ct_F77@,$ac_ct_F77,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -s,@global_top_auxdir@,$global_top_auxdir,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF +if test -n "$CONFIG_FILES"; then _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +am__isrc!$am__isrc$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim +ACLOCAL!$ACLOCAL$ac_delim +AUTOCONF!$AUTOCONF$ac_delim +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +DEPDIR!$DEPDIR$ac_delim +am__include!$am__include$ac_delim +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +CCDEPMODE!$CCDEPMODE$ac_delim +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +SED!$SED$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LN_S!$LN_S$ac_delim +ECHO!$ECHO$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +CPP!$CPP$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -fi # test -n "$CONFIG_FILES" +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +CXXCPP!$CXXCPP$ac_delim +F77!$F77$ac_delim +FFLAGS!$FFLAGS$ac_delim +ac_ct_F77!$ac_ct_F77$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +global_top_auxdir!$global_top_auxdir$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; esac +_ACEOF - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub @@ -19587,142 +20398,44 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac + ;; - ac_builddir=. -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -19730,20 +20443,32 @@ echo "$as_me: executing $ac_dest commands" >&6;} # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(/\)' \| . 2>/dev/null || echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi @@ -19765,53 +20490,79 @@ echo X"$mf" | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(/\)' \| . 2>/dev/null || echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; + esac -done -_ACEOF +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF diff --git a/autoconf-lib-link/tests/rpathy/Makefile.in b/autoconf-lib-link/tests/rpathy/Makefile.in index 7b221d467..90e410bf0 100644 --- a/autoconf-lib-link/tests/rpathy/Makefile.in +++ b/autoconf-lib-link/tests/rpathy/Makefile.in @@ -45,9 +45,10 @@ DIST_COMMON = $(am__configure_deps) \ $(top_srcdir)/configure ../../../build-aux/compile \ ../../../build-aux/config.guess \ ../../../build-aux/config.rpath ../../../build-aux/config.sub \ - ../../../build-aux/elisp-comp ../../../build-aux/install-sh \ - ../../../build-aux/ltmain.sh ../../../build-aux/mdate-sh \ - ../../../build-aux/missing ../../../build-aux/mkinstalldirs \ + ../../../build-aux/depcomp ../../../build-aux/elisp-comp \ + ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \ + ../../../build-aux/mdate-sh ../../../build-aux/missing \ + ../../../build-aux/mkinstalldirs \ ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -136,6 +137,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBRPATHX = @LIBRPATHX@ +LIBRPATHX_PREFIX = @LIBRPATHX_PREFIX@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -152,6 +154,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ diff --git a/autoconf-lib-link/tests/rpathy/configure b/autoconf-lib-link/tests/rpathy/configure index b1e8e1e12..29d7bb18b 100755 --- a/autoconf-lib-link/tests/rpathy/configure +++ b/autoconf-lib-link/tests/rpathy/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60. +# Generated by GNU Autoconf 2.61. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -10,7 +10,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; } else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -233,7 +237,6 @@ IFS=$as_save_IFS # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : _ASEOF @@ -253,7 +258,6 @@ _ASEOF CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : (as_func_return () { @@ -512,19 +518,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -719,36 +734,36 @@ ac_unique_file="configure.ac" # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include #endif -#if HAVE_STDINT_H +#ifdef HAVE_STDINT_H # include #endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include #endif" @@ -835,6 +850,7 @@ host host_cpu host_vendor host_os +SED GREP EGREP LN_S @@ -855,6 +871,7 @@ ac_ct_F77 LIBTOOL LIBRPATHX LTLIBRPATHX +LIBRPATHX_PREFIX global_top_auxdir LIBOBJS LTLIBOBJS' @@ -865,6 +882,7 @@ target_alias CC CFLAGS LDFLAGS +LIBS CPPFLAGS CPP CXX @@ -978,10 +996,10 @@ do -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -997,10 +1015,10 @@ do -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -1194,19 +1212,19 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=no ;; --x) @@ -1475,6 +1493,7 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor @@ -1548,7 +1567,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1562,7 +1581,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1975,7 +1994,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2103,7 +2122,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2156,7 +2175,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2295,7 +2314,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2335,7 +2354,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2411,7 +2430,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2451,7 +2470,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2508,7 +2527,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2549,7 +2568,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2607,7 +2626,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2651,7 +2670,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2792,7 +2811,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2820,6 +2839,12 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2831,8 +2856,6 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -3010,27 +3033,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -3085,27 +3091,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3140,27 +3129,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -3196,27 +3168,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3332,27 +3287,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -3728,12 +3666,13 @@ do test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3768,6 +3707,7 @@ done fi SED=$lt_cv_path_SED + { echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6; } @@ -3792,7 +3732,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3874,7 +3814,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4129,8 +4069,8 @@ else echo "${ECHO_T}no, using $LN_S" >&6; } fi -{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4171,16 +4111,22 @@ cygwin*) mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -4218,7 +4164,7 @@ hpux10.20* | hpux11*) esac ;; -interix3*) +interix[3-9]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ;; @@ -4234,7 +4180,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -4268,6 +4214,10 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -4355,7 +4305,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4358 "configure"' > conftest.$ac_ext + echo '#line 4308 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4390,7 +4340,8 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -4401,6 +4352,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -4417,6 +4371,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -4479,27 +4436,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 @@ -4508,7 +4449,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4602,17 +4543,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -4646,17 +4580,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -4721,17 +4648,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -4765,17 +4685,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -4846,27 +4759,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 @@ -5042,27 +4938,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 @@ -5125,27 +5004,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -5181,17 +5043,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -5278,7 +5133,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5322,7 +5177,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5435,27 +5290,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -5510,27 +5348,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 @@ -5565,27 +5386,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -5621,27 +5425,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 @@ -5843,17 +5630,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -5887,17 +5667,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5962,17 +5735,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -6006,17 +5772,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -6057,7 +5816,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -6075,7 +5834,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6101,7 +5860,7 @@ fi fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6119,7 +5878,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6226,27 +5985,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -6289,27 +6031,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 @@ -6436,24 +6161,27 @@ else fi ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac @@ -6470,6 +6198,7 @@ fi + # Check for command to grab the raw symbol name followed by C symbol from nm. { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } @@ -6507,7 +6236,7 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) +linux* | k*bsd*-gnu) if test "$host_cpu" = ia64; then symcode='[ABCDGIRSTW]' lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -6764,7 +6493,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6804,7 +6533,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6860,7 +6589,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6900,7 +6629,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6956,7 +6685,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6996,7 +6725,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7058,7 +6787,7 @@ test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -7258,10 +6987,10 @@ objext=o objext=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' # If no C compiler was specified, use CC. @@ -7276,13 +7005,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -7302,7 +7031,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -7313,11 +7042,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7316: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7045: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7320: \$? = $ac_status" >&5 + echo "$as_me:7049: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7386,7 +7115,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -7447,8 +7176,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' ;; @@ -7479,7 +7206,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl='-Wl,' @@ -7526,6 +7253,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static='-non_shared' ;; + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + solaris*) lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -7593,7 +7324,7 @@ if test "${lt_prog_compiler_pic_works+set}" = set; then else lt_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -7604,11 +7335,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7607: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7338: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7611: \$? = $ac_status" >&5 + echo "$as_me:7342: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7657,7 +7388,7 @@ else lt_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7697,7 +7428,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -7708,11 +7439,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7711: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7442: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7715: \$? = $ac_status" >&5 + echo "$as_me:7446: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7904,7 +7635,7 @@ EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -7922,7 +7653,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' @@ -7937,7 +7668,7 @@ EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -7957,7 +7688,7 @@ EOF esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; @@ -8129,7 +7860,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct=yes + : else # We have old collect2 hardcode_direct=unsupported @@ -8197,33 +7928,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -8231,7 +7953,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8272,33 +7994,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -8306,7 +8019,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8352,7 +8065,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes=yes ;; @@ -8394,10 +8107,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -8437,7 +8150,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -8559,24 +8272,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs=no fi ;; @@ -8635,17 +8352,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs=yes ;; @@ -8702,7 +8418,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag='${wl}-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no @@ -8779,7 +8495,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -8837,17 +8553,55 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" + if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -9007,12 +8761,8 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -9029,18 +8779,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -9078,7 +8816,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -9141,7 +8879,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -9196,7 +8934,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -9212,7 +8950,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -9225,18 +8963,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -9318,6 +9044,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -9471,6 +9201,7 @@ else darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } else @@ -9554,27 +9285,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -9583,7 +9298,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -9665,27 +9380,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -9694,7 +9393,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 @@ -9744,27 +9443,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -9773,7 +9456,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -9845,27 +9528,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -9874,7 +9541,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 @@ -9924,27 +9591,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -9953,7 +9604,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10004,27 +9655,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -10033,7 +9668,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10084,27 +9719,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 @@ -10113,7 +9732,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10169,7 +9788,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6;} # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -10835,7 +10455,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols @@ -11004,10 +10624,10 @@ objext=o objext_CXX=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -11023,13 +10643,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -11288,7 +10908,7 @@ case $host_os in strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_CXX=yes + : else # We have old collect2 hardcode_direct_CXX=unsupported @@ -11356,33 +10976,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11390,7 +11001,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11432,33 +11043,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11466,7 +11068,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11577,10 +11179,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -11614,7 +11216,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -11663,9 +11265,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator_CXX=: case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_CXX='+b $libdir' - ;; + hppa*64*|ia64*) ;; *) export_dynamic_flag_spec_CXX='${wl}-E' ;; @@ -11733,7 +11333,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - interix3*) + interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' @@ -11773,7 +11373,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -11914,16 +11514,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; openbsd*) - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + else + ld_shlibs_CXX=no fi - output_verbose_link_cmd='echo' ;; osf3*) case $cc_basename in @@ -12085,15 +11689,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs_CXX=yes @@ -12140,6 +11739,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac @@ -12331,7 +11936,7 @@ $rm -f confest.$objext # PORTME: override above test on systems where it is broken case $host_os in -interix3*) +interix[3-9]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. predep_objects_CXX= @@ -12343,7 +11948,19 @@ linux*) case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 - postdeps_CXX='-lCstd -lCrun' + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -12351,10 +11968,22 @@ linux*) solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - postdeps_CXX='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -12410,7 +12039,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -12476,7 +12105,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -12519,7 +12148,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -12668,7 +12297,7 @@ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then else lt_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -12679,11 +12308,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12682: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12311: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12686: \$? = $ac_status" >&5 + echo "$as_me:12315: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12732,7 +12361,7 @@ else lt_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12772,7 +12401,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -12783,11 +12412,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12786: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12415: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12790: \$? = $ac_status" >&5 + echo "$as_me:12419: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12853,7 +12482,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -12884,7 +12513,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -12942,20 +12571,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -13112,12 +12728,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -13134,18 +12745,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -13183,7 +12782,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -13246,7 +12845,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -13301,7 +12900,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -13317,29 +12916,17 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' ;; netbsd*) @@ -13423,6 +13010,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -13617,6 +13208,7 @@ if test -f "$ltmain"; then module_cmds_CXX \ module_expsym_cmds_CXX \ lt_cv_prog_compiler_c_o_CXX \ + fix_srcfile_path_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX; do @@ -13937,7 +13529,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_CXX" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -14028,10 +13620,17 @@ objext=o objext_F77=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -14047,13 +13646,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -14158,7 +13757,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic_F77='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -14219,8 +13818,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries lt_prog_compiler_pic_F77='-DDLL_EXPORT' ;; @@ -14251,7 +13848,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_F77='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' @@ -14298,6 +13895,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_F77='-non_shared' ;; + rdos*) + lt_prog_compiler_static_F77='-non_shared' + ;; + solaris*) lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -14365,7 +13966,7 @@ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then else lt_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -14376,11 +13977,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14379: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13980: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14383: \$? = $ac_status" >&5 + echo "$as_me:13984: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14429,7 +14030,7 @@ else lt_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14469,7 +14070,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -14480,11 +14081,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14483: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14084: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14487: \$? = $ac_status" >&5 + echo "$as_me:14088: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14676,7 +14277,7 @@ EOF allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -14694,7 +14295,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct_F77=no hardcode_shlibpath_var_F77=no hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' @@ -14709,7 +14310,7 @@ EOF archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -14729,7 +14330,7 @@ EOF esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null' + whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; @@ -14901,7 +14502,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_F77=yes + : else # We have old collect2 hardcode_direct_F77=unsupported @@ -14959,33 +14560,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -14993,7 +14585,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15024,33 +14616,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15058,7 +14641,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15104,7 +14687,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path_F77='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; @@ -15146,10 +14729,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -15189,7 +14772,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -15311,24 +14894,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + ;; + *) + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_F77=no fi ;; @@ -15387,17 +14974,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_F77=yes ;; @@ -15454,7 +15040,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag_F77='${wl}-z,text' archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no @@ -15531,7 +15117,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -15589,20 +15175,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -15759,12 +15332,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -15781,18 +15349,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -15830,7 +15386,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -15893,7 +15449,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -15948,7 +15504,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -15964,7 +15520,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -15977,18 +15533,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -16070,6 +15614,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -16264,6 +15812,7 @@ if test -f "$ltmain"; then module_cmds_F77 \ module_expsym_cmds_F77 \ lt_cv_prog_compiler_c_o_F77 \ + fix_srcfile_path_F77 \ exclude_expsyms_F77 \ include_expsyms_F77; do @@ -16584,7 +16133,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_F77" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_F77 @@ -16642,10 +16191,10 @@ objext=o objext_GCJ=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -16661,13 +16210,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -16708,7 +16257,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -16719,11 +16268,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16722: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16271: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16726: \$? = $ac_status" >&5 + echo "$as_me:16275: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16792,7 +16341,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic_GCJ='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -16853,8 +16402,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ;; @@ -16885,7 +16432,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_GCJ='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' @@ -16932,6 +16479,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_GCJ='-non_shared' ;; + rdos*) + lt_prog_compiler_static_GCJ='-non_shared' + ;; + solaris*) lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -16999,7 +16550,7 @@ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then else lt_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -17010,11 +16561,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17013: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16564: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17017: \$? = $ac_status" >&5 + echo "$as_me:16568: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17063,7 +16614,7 @@ else lt_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17103,7 +16654,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -17114,11 +16665,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17117: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16668: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17121: \$? = $ac_status" >&5 + echo "$as_me:16672: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17310,7 +16861,7 @@ EOF allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -17328,7 +16879,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' @@ -17343,7 +16894,7 @@ EOF archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -17363,7 +16914,7 @@ EOF esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null' + whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; @@ -17535,7 +17086,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_GCJ=yes + : else # We have old collect2 hardcode_direct_GCJ=unsupported @@ -17603,33 +17154,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17637,7 +17179,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17678,33 +17220,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17712,7 +17245,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17758,7 +17291,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; @@ -17800,10 +17333,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -17843,7 +17376,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -17965,24 +17498,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + ;; + *) + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - ;; - *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_GCJ=no fi ;; @@ -18041,17 +17578,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_GCJ=yes ;; @@ -18108,7 +17644,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag_GCJ='${wl}-z,text' archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no @@ -18185,7 +17721,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -18243,20 +17779,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -18413,12 +17936,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -18435,18 +17953,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -18484,7 +17990,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -18547,7 +18053,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -18602,7 +18108,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -18618,7 +18124,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -18631,18 +18137,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -18724,6 +18218,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -18918,6 +18416,7 @@ if test -f "$ltmain"; then module_cmds_GCJ \ module_expsym_cmds_GCJ \ lt_cv_prog_compiler_c_o_GCJ \ + fix_srcfile_path_GCJ \ exclude_expsyms_GCJ \ include_expsyms_GCJ; do @@ -19238,7 +18737,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_GCJ" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_GCJ @@ -19295,7 +18794,7 @@ objext=o objext_RC=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -19314,13 +18813,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -19398,6 +18897,7 @@ if test -f "$ltmain"; then module_cmds_RC \ module_expsym_cmds_RC \ lt_cv_prog_compiler_c_o_RC \ + fix_srcfile_path_RC \ exclude_expsyms_RC \ include_expsyms_RC; do @@ -19718,7 +19218,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_RC" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_RC @@ -19966,12 +19466,14 @@ fi { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then enableval=$enable_rpath; : @@ -20013,6 +19515,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -20057,6 +19560,7 @@ fi LIBRPATHX= LTLIBRPATHX= INCRPATHX= + LIBRPATHX_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -20090,27 +19594,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -20128,26 +19655,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -20173,10 +19716,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" haveit= for x in $rpathdirs; do @@ -20208,7 +19751,7 @@ fi if test -z "$haveit"; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" else LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name" @@ -20227,6 +19770,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHX_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -20377,21 +19921,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$flag" done @@ -20406,6 +19950,7 @@ fi ac_cv_librpathx_libs="$LIBRPATHX" ac_cv_librpathx_ltlibs="$LTLIBRPATHX" ac_cv_librpathx_cppflags="$INCRPATHX" + ac_cv_librpathx_prefix="$LIBRPATHX_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathx_libs" >&5 @@ -20413,6 +19958,7 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6; } LIBRPATHX="$ac_cv_librpathx_libs" LTLIBRPATHX="$ac_cv_librpathx_ltlibs" INCRPATHX="$ac_cv_librpathx_cppflags" + LIBRPATHX_PREFIX="$ac_cv_librpathx_prefix" for element in $INCRPATHX; do haveit= @@ -20438,6 +19984,7 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6; } + HAVE_LIBRPATHX=yes @@ -20616,7 +20163,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -20625,10 +20173,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -20852,19 +20403,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -20880,7 +20440,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -20908,7 +20468,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -20927,7 +20487,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -21177,6 +20737,7 @@ host!$host$ac_delim host_cpu!$host_cpu$ac_delim host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim +SED!$SED$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim LN_S!$LN_S$ac_delim @@ -21190,7 +20751,6 @@ ac_ct_CXX!$ac_ct_CXX$ac_delim CXXDEPMODE!$CXXDEPMODE$ac_delim am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -CXXCPP!$CXXCPP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -21232,18 +20792,20 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +CXXCPP!$CXXCPP$ac_delim F77!$F77$ac_delim FFLAGS!$FFLAGS$ac_delim ac_ct_F77!$ac_ct_F77$ac_delim LIBTOOL!$LIBTOOL$ac_delim LIBRPATHX!$LIBRPATHX$ac_delim LTLIBRPATHX!$LTLIBRPATHX$ac_delim +LIBRPATHX_PREFIX!$LIBRPATHX_PREFIX$ac_delim global_top_auxdir!$global_top_auxdir$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/autoconf-lib-link/tests/rpathz/Makefile.in b/autoconf-lib-link/tests/rpathz/Makefile.in index a819a7747..0096f064b 100644 --- a/autoconf-lib-link/tests/rpathz/Makefile.in +++ b/autoconf-lib-link/tests/rpathz/Makefile.in @@ -45,9 +45,10 @@ DIST_COMMON = $(am__configure_deps) \ $(top_srcdir)/configure ../../../build-aux/compile \ ../../../build-aux/config.guess \ ../../../build-aux/config.rpath ../../../build-aux/config.sub \ - ../../../build-aux/elisp-comp ../../../build-aux/install-sh \ - ../../../build-aux/ltmain.sh ../../../build-aux/mdate-sh \ - ../../../build-aux/missing ../../../build-aux/mkinstalldirs \ + ../../../build-aux/depcomp ../../../build-aux/elisp-comp \ + ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \ + ../../../build-aux/mdate-sh ../../../build-aux/missing \ + ../../../build-aux/mkinstalldirs \ ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -136,7 +137,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBRPATHX = @LIBRPATHX@ +LIBRPATHX_PREFIX = @LIBRPATHX_PREFIX@ LIBRPATHY = @LIBRPATHY@ +LIBRPATHY_PREFIX = @LIBRPATHY_PREFIX@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -154,6 +157,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ diff --git a/autoconf-lib-link/tests/rpathz/configure b/autoconf-lib-link/tests/rpathz/configure index cab685758..985485d71 100755 --- a/autoconf-lib-link/tests/rpathz/configure +++ b/autoconf-lib-link/tests/rpathz/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60. +# Generated by GNU Autoconf 2.61. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -10,7 +10,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; } else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -233,7 +237,6 @@ IFS=$as_save_IFS # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : _ASEOF @@ -253,7 +258,6 @@ _ASEOF CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : (as_func_return () { @@ -512,19 +518,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -719,36 +734,36 @@ ac_unique_file="configure.ac" # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include #endif -#if HAVE_STDINT_H +#ifdef HAVE_STDINT_H # include #endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include #endif" @@ -835,6 +850,7 @@ host host_cpu host_vendor host_os +SED GREP EGREP LN_S @@ -855,8 +871,10 @@ ac_ct_F77 LIBTOOL LIBRPATHX LTLIBRPATHX +LIBRPATHX_PREFIX LIBRPATHY LTLIBRPATHY +LIBRPATHY_PREFIX global_top_auxdir LIBOBJS LTLIBOBJS' @@ -867,6 +885,7 @@ target_alias CC CFLAGS LDFLAGS +LIBS CPPFLAGS CPP CXX @@ -980,10 +999,10 @@ do -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -999,10 +1018,10 @@ do -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -1196,19 +1215,19 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=no ;; --x) @@ -1479,6 +1498,7 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor @@ -1552,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1566,7 +1586,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1979,7 +1999,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2107,7 +2127,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2160,7 +2180,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2299,7 +2319,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2339,7 +2359,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2415,7 +2435,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2455,7 +2475,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2512,7 +2532,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2553,7 +2573,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2611,7 +2631,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2655,7 +2675,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2796,7 +2816,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2824,6 +2844,12 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2835,8 +2861,6 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -3014,27 +3038,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -3089,27 +3096,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3144,27 +3134,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -3200,27 +3173,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3336,27 +3292,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -3732,12 +3671,13 @@ do test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3772,6 +3712,7 @@ done fi SED=$lt_cv_path_SED + { echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6; } @@ -3796,7 +3737,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3878,7 +3819,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4133,8 +4074,8 @@ else echo "${ECHO_T}no, using $LN_S" >&6; } fi -{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4175,16 +4116,22 @@ cygwin*) mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -4222,7 +4169,7 @@ hpux10.20* | hpux11*) esac ;; -interix3*) +interix[3-9]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ;; @@ -4238,7 +4185,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -4272,6 +4219,10 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -4359,7 +4310,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4362 "configure"' > conftest.$ac_ext + echo '#line 4313 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4394,7 +4345,8 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -4405,6 +4357,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -4421,6 +4376,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -4483,27 +4441,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 @@ -4512,7 +4454,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4606,17 +4548,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -4650,17 +4585,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -4725,17 +4653,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -4769,17 +4690,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -4850,27 +4764,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 @@ -5046,27 +4943,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 @@ -5129,27 +5009,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -5185,17 +5048,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -5282,7 +5138,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5326,7 +5182,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5439,27 +5295,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -5514,27 +5353,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 @@ -5569,27 +5391,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -5625,27 +5430,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 @@ -5847,17 +5635,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -5891,17 +5672,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5966,17 +5740,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -6010,17 +5777,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -6061,7 +5821,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -6079,7 +5839,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6105,7 +5865,7 @@ fi fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6123,7 +5883,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6230,27 +5990,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -6293,27 +6036,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 @@ -6440,24 +6166,27 @@ else fi ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac @@ -6474,6 +6203,7 @@ fi + # Check for command to grab the raw symbol name followed by C symbol from nm. { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } @@ -6511,7 +6241,7 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) +linux* | k*bsd*-gnu) if test "$host_cpu" = ia64; then symcode='[ABCDGIRSTW]' lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -6768,7 +6498,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6808,7 +6538,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6864,7 +6594,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6904,7 +6634,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6960,7 +6690,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7000,7 +6730,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7062,7 +6792,7 @@ test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -7262,10 +6992,10 @@ objext=o objext=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' # If no C compiler was specified, use CC. @@ -7280,13 +7010,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -7306,7 +7036,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -7317,11 +7047,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7320: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7050: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7324: \$? = $ac_status" >&5 + echo "$as_me:7054: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7390,7 +7120,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -7451,8 +7181,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' ;; @@ -7483,7 +7211,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl='-Wl,' @@ -7530,6 +7258,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static='-non_shared' ;; + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + solaris*) lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -7597,7 +7329,7 @@ if test "${lt_prog_compiler_pic_works+set}" = set; then else lt_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -7608,11 +7340,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7611: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7343: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7615: \$? = $ac_status" >&5 + echo "$as_me:7347: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7661,7 +7393,7 @@ else lt_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7701,7 +7433,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -7712,11 +7444,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7715: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7447: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7719: \$? = $ac_status" >&5 + echo "$as_me:7451: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7908,7 +7640,7 @@ EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -7926,7 +7658,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' @@ -7941,7 +7673,7 @@ EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -7961,7 +7693,7 @@ EOF esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; @@ -8133,7 +7865,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct=yes + : else # We have old collect2 hardcode_direct=unsupported @@ -8201,33 +7933,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -8235,7 +7958,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8276,33 +7999,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -8310,7 +8024,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8356,7 +8070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes=yes ;; @@ -8398,10 +8112,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -8441,7 +8155,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -8563,24 +8277,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs=no fi ;; @@ -8639,17 +8357,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs=yes ;; @@ -8706,7 +8423,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag='${wl}-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no @@ -8783,7 +8500,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -8841,17 +8558,55 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" + if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -9011,12 +8766,8 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -9033,18 +8784,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -9082,7 +8821,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -9145,7 +8884,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -9200,7 +8939,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -9216,7 +8955,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -9229,18 +8968,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -9322,6 +9049,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -9475,6 +9206,7 @@ else darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } else @@ -9558,27 +9290,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -9587,7 +9303,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -9669,27 +9385,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -9698,7 +9398,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 @@ -9748,27 +9448,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -9777,7 +9461,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -9849,27 +9533,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -9878,7 +9546,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 @@ -9928,27 +9596,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -9957,7 +9609,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10008,27 +9660,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -10037,7 +9673,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10088,27 +9724,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 @@ -10117,7 +9737,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10173,7 +9793,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6;} # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -10839,7 +10460,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols @@ -11008,10 +10629,10 @@ objext=o objext_CXX=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -11027,13 +10648,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -11292,7 +10913,7 @@ case $host_os in strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_CXX=yes + : else # We have old collect2 hardcode_direct_CXX=unsupported @@ -11360,33 +10981,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11394,7 +11006,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11436,33 +11048,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11470,7 +11073,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11581,10 +11184,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -11618,7 +11221,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -11667,9 +11270,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator_CXX=: case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_CXX='+b $libdir' - ;; + hppa*64*|ia64*) ;; *) export_dynamic_flag_spec_CXX='${wl}-E' ;; @@ -11737,7 +11338,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - interix3*) + interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' @@ -11777,7 +11378,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -11918,16 +11519,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; openbsd*) - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + else + ld_shlibs_CXX=no fi - output_verbose_link_cmd='echo' ;; osf3*) case $cc_basename in @@ -12089,15 +11694,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs_CXX=yes @@ -12144,6 +11744,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac @@ -12335,7 +11941,7 @@ $rm -f confest.$objext # PORTME: override above test on systems where it is broken case $host_os in -interix3*) +interix[3-9]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. predep_objects_CXX= @@ -12347,7 +11953,19 @@ linux*) case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 - postdeps_CXX='-lCstd -lCrun' + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -12355,10 +11973,22 @@ linux*) solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - postdeps_CXX='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -12414,7 +12044,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -12480,7 +12110,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -12523,7 +12153,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -12672,7 +12302,7 @@ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then else lt_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -12683,11 +12313,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12686: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12316: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12690: \$? = $ac_status" >&5 + echo "$as_me:12320: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12736,7 +12366,7 @@ else lt_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12776,7 +12406,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -12787,11 +12417,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12790: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12420: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12794: \$? = $ac_status" >&5 + echo "$as_me:12424: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12857,7 +12487,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -12888,7 +12518,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -12946,20 +12576,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -13116,12 +12733,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -13138,18 +12750,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -13187,7 +12787,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -13250,7 +12850,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -13305,7 +12905,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -13321,7 +12921,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -13334,18 +12934,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -13427,6 +13015,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -13621,6 +13213,7 @@ if test -f "$ltmain"; then module_cmds_CXX \ module_expsym_cmds_CXX \ lt_cv_prog_compiler_c_o_CXX \ + fix_srcfile_path_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX; do @@ -13941,7 +13534,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_CXX" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -14032,10 +13625,17 @@ objext=o objext_F77=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -14051,13 +13651,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -14162,7 +13762,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic_F77='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -14223,8 +13823,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries lt_prog_compiler_pic_F77='-DDLL_EXPORT' ;; @@ -14255,7 +13853,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_F77='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' @@ -14302,6 +13900,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_F77='-non_shared' ;; + rdos*) + lt_prog_compiler_static_F77='-non_shared' + ;; + solaris*) lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -14369,7 +13971,7 @@ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then else lt_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -14380,11 +13982,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14383: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13985: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14387: \$? = $ac_status" >&5 + echo "$as_me:13989: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14433,7 +14035,7 @@ else lt_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14473,7 +14075,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -14484,11 +14086,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14487: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14089: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14491: \$? = $ac_status" >&5 + echo "$as_me:14093: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14680,7 +14282,7 @@ EOF allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -14698,7 +14300,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct_F77=no hardcode_shlibpath_var_F77=no hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' @@ -14713,7 +14315,7 @@ EOF archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -14733,7 +14335,7 @@ EOF esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null' + whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; @@ -14905,7 +14507,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_F77=yes + : else # We have old collect2 hardcode_direct_F77=unsupported @@ -14957,39 +14559,30 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -14997,7 +14590,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15028,33 +14621,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15062,7 +14646,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15108,7 +14692,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path_F77='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; @@ -15150,10 +14734,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -15193,7 +14777,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -15315,24 +14899,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + ;; + *) + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_F77=no fi ;; @@ -15391,17 +14979,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_F77=yes ;; @@ -15458,7 +15045,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag_F77='${wl}-z,text' archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no @@ -15535,7 +15122,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -15593,20 +15180,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -15763,12 +15337,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -15785,18 +15354,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -15834,7 +15391,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -15897,7 +15454,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -15952,7 +15509,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -15968,7 +15525,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -15981,18 +15538,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -16074,6 +15619,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -16268,6 +15817,7 @@ if test -f "$ltmain"; then module_cmds_F77 \ module_expsym_cmds_F77 \ lt_cv_prog_compiler_c_o_F77 \ + fix_srcfile_path_F77 \ exclude_expsyms_F77 \ include_expsyms_F77; do @@ -16588,7 +16138,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_F77" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_F77 @@ -16646,10 +16196,10 @@ objext=o objext_GCJ=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -16665,13 +16215,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -16712,7 +16262,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -16723,11 +16273,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16726: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16276: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16730: \$? = $ac_status" >&5 + echo "$as_me:16280: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16796,7 +16346,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic_GCJ='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -16857,8 +16407,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ;; @@ -16889,7 +16437,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_GCJ='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' @@ -16936,6 +16484,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_GCJ='-non_shared' ;; + rdos*) + lt_prog_compiler_static_GCJ='-non_shared' + ;; + solaris*) lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -17003,7 +16555,7 @@ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then else lt_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -17014,11 +16566,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17017: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16569: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17021: \$? = $ac_status" >&5 + echo "$as_me:16573: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17067,7 +16619,7 @@ else lt_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17107,7 +16659,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -17118,11 +16670,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17121: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16673: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17125: \$? = $ac_status" >&5 + echo "$as_me:16677: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17314,7 +16866,7 @@ EOF allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -17332,7 +16884,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' @@ -17347,7 +16899,7 @@ EOF archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -17367,7 +16919,7 @@ EOF esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null' + whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; @@ -17539,7 +17091,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_GCJ=yes + : else # We have old collect2 hardcode_direct_GCJ=unsupported @@ -17607,33 +17159,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17641,7 +17184,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17682,33 +17225,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17716,7 +17250,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17762,7 +17296,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; @@ -17804,10 +17338,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -17847,7 +17381,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -17969,24 +17503,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + ;; + *) + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - ;; - *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_GCJ=no fi ;; @@ -18045,17 +17583,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_GCJ=yes ;; @@ -18112,7 +17649,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag_GCJ='${wl}-z,text' archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no @@ -18189,7 +17726,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -18247,20 +17784,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -18417,12 +17941,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -18439,18 +17958,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -18488,7 +17995,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -18551,7 +18058,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -18606,7 +18113,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -18622,7 +18129,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -18635,18 +18142,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -18728,6 +18223,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -18922,6 +18421,7 @@ if test -f "$ltmain"; then module_cmds_GCJ \ module_expsym_cmds_GCJ \ lt_cv_prog_compiler_c_o_GCJ \ + fix_srcfile_path_GCJ \ exclude_expsyms_GCJ \ include_expsyms_GCJ; do @@ -19242,7 +18742,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_GCJ" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_GCJ @@ -19299,7 +18799,7 @@ objext=o objext_RC=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -19318,13 +18818,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -19402,6 +18902,7 @@ if test -f "$ltmain"; then module_cmds_RC \ module_expsym_cmds_RC \ lt_cv_prog_compiler_c_o_RC \ + fix_srcfile_path_RC \ exclude_expsyms_RC \ include_expsyms_RC; do @@ -19722,7 +19223,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_RC" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_RC @@ -19970,12 +19471,14 @@ fi { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then enableval=$enable_rpath; : @@ -20017,6 +19520,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -20061,6 +19565,7 @@ fi LIBRPATHX= LTLIBRPATHX= INCRPATHX= + LIBRPATHX_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -20094,27 +19599,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -20132,26 +19660,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -20177,10 +19721,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" haveit= for x in $rpathdirs; do @@ -20212,7 +19756,7 @@ fi if test -z "$haveit"; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so" else LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name" @@ -20231,6 +19775,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHX_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -20381,21 +19926,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$flag" done @@ -20410,6 +19955,7 @@ fi ac_cv_librpathx_libs="$LIBRPATHX" ac_cv_librpathx_ltlibs="$LTLIBRPATHX" ac_cv_librpathx_cppflags="$INCRPATHX" + ac_cv_librpathx_prefix="$LIBRPATHX_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathx_libs" >&5 @@ -20417,6 +19963,7 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6; } LIBRPATHX="$ac_cv_librpathx_libs" LTLIBRPATHX="$ac_cv_librpathx_ltlibs" INCRPATHX="$ac_cv_librpathx_cppflags" + LIBRPATHX_PREFIX="$ac_cv_librpathx_prefix" for element in $INCRPATHX; do haveit= @@ -20442,6 +19989,7 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6; } + HAVE_LIBRPATHX=yes @@ -20460,6 +20008,7 @@ else + use_additional=yes acl_save_prefix="$prefix" @@ -20504,6 +20053,7 @@ fi LIBRPATHY= LTLIBRPATHY= INCRPATHY= + LIBRPATHY_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -20537,27 +20087,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -20575,26 +20148,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -20620,10 +20209,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" haveit= for x in $rpathdirs; do @@ -20655,7 +20244,7 @@ fi if test -z "$haveit"; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so" else LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-l$name" @@ -20674,6 +20263,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBRPATHY_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -20824,21 +20414,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$flag" done @@ -20853,6 +20443,7 @@ fi ac_cv_librpathy_libs="$LIBRPATHY" ac_cv_librpathy_ltlibs="$LTLIBRPATHY" ac_cv_librpathy_cppflags="$INCRPATHY" + ac_cv_librpathy_prefix="$LIBRPATHY_PREFIX" fi { echo "$as_me:$LINENO: result: $ac_cv_librpathy_libs" >&5 @@ -20860,6 +20451,7 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6; } LIBRPATHY="$ac_cv_librpathy_libs" LTLIBRPATHY="$ac_cv_librpathy_ltlibs" INCRPATHY="$ac_cv_librpathy_cppflags" + LIBRPATHY_PREFIX="$ac_cv_librpathy_prefix" for element in $INCRPATHY; do haveit= @@ -20885,6 +20477,7 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6; } + HAVE_LIBRPATHY=yes @@ -21063,7 +20656,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -21072,10 +20666,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -21299,19 +20896,28 @@ else as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -21327,7 +20933,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -21355,7 +20961,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -21374,7 +20980,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -21624,6 +21230,7 @@ host!$host$ac_delim host_cpu!$host_cpu$ac_delim host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim +SED!$SED$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim LN_S!$LN_S$ac_delim @@ -21637,7 +21244,6 @@ ac_ct_CXX!$ac_ct_CXX$ac_delim CXXDEPMODE!$CXXDEPMODE$ac_delim am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -CXXCPP!$CXXCPP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -21679,20 +21285,23 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +CXXCPP!$CXXCPP$ac_delim F77!$F77$ac_delim FFLAGS!$FFLAGS$ac_delim ac_ct_F77!$ac_ct_F77$ac_delim LIBTOOL!$LIBTOOL$ac_delim LIBRPATHX!$LIBRPATHX$ac_delim LTLIBRPATHX!$LTLIBRPATHX$ac_delim +LIBRPATHX_PREFIX!$LIBRPATHX_PREFIX$ac_delim LIBRPATHY!$LIBRPATHY$ac_delim LTLIBRPATHY!$LTLIBRPATHY$ac_delim +LIBRPATHY_PREFIX!$LIBRPATHY_PREFIX$ac_delim global_top_auxdir!$global_top_auxdir$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/gettext-runtime/ABOUT-NLS b/gettext-runtime/ABOUT-NLS index ec20977e0..83bc72ec2 100644 --- a/gettext-runtime/ABOUT-NLS +++ b/gettext-runtime/ABOUT-NLS @@ -101,8 +101,11 @@ codes, stating which languages are allowed. As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate -`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, -and `CC' is an ISO 3166 two-letter country code. For example, let's +`LL_CC' combination. If you happen to have the `LC_ALL' or some other +`LC_xxx' environment variables set, you should unset them before +setting `LANG', otherwise the setting of `LANG' will not have the +desired effect. Here `LL' is an ISO 639 two-letter language code, and +`CC' is an ISO 3166 two-letter country code. For example, let's suppose that you speak German and live in Germany. At the shell prompt, merely execute `setenv LANG de_DE' (in `csh'), `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). @@ -153,8 +156,7 @@ people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, -`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" -area. +`http://translationproject.org/', in the "Teams" area. If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. @@ -168,8 +170,8 @@ message to `sv-request@li.org', having this message body: _actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to -get started, please write to `translation@iro.umontreal.ca' to reach the -coordinator for all translator teams. +get started, please write to `coordinator@translationproject.org' to +reach the coordinator for all translator teams. The English team is special. It works at improving and uniformizing the terminology in use. Proven linguistic skills are praised more than @@ -179,67 +181,62 @@ programming skills, here. ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of October -2006. The matrix shows, in regard of each package, for which languages +matrix shows the current state of internationalization, as of November +2007. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo +----------------------------------------------------+ - GNUnet | [] | + Compendium | [] [] [] [] | a2ps | [] [] [] [] [] | aegis | () | ant-phone | () | anubis | [] | ap-utils | | aspell | [] [] [] [] [] | - bash | [] [] [] | - batchelor | [] | + bash | [] | bfd | | bibshelf | [] | - binutils | [] | + binutils | | bison | [] [] | - bison-runtime | | + bison-runtime | [] | bluez-pin | [] [] [] [] [] | cflow | [] | - clisp | [] [] | + clisp | [] [] [] | console-tools | [] [] | - coreutils | [] [] [] | + coreutils | [] [] [] [] | cpio | | cpplib | [] [] [] | cryptonit | [] | - darkstat | [] () [] | - dialog | [] [] [] [] [] [] | + dialog | | diffutils | [] [] [] [] [] [] | doodle | [] | e2fsprogs | [] [] | enscript | [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] () [] | - fileutils | [] [] | - findutils | [] [] [] | + fetchmail | [] [] () [] [] | + findutils | [] | + findutils_stable | [] [] [] | flex | [] [] [] | - fslint | [] | + fslint | | gas | | gawk | [] [] [] | - gbiff | [] | gcal | [] | gcc | [] | gettext-examples | [] [] [] [] [] | gettext-runtime | [] [] [] [] [] | gettext-tools | [] [] | - gimp-print | [] [] [] [] | gip | [] | - gliv | [] | + gliv | [] [] | glunarclock | [] | gmult | [] [] | gnubiff | () | - gnucash | () () [] | - gnucash-glossary | [] () | + gnucash | [] [] () () [] | gnuedu | | - gnulib | [] [] [] [] [] [] | + gnulib | [] | + gnunet | | gnunet-gtk | | - gnutls | | + gnutls | [] | gpe-aerial | [] [] | gpe-beam | [] [] | gpe-calendar | | @@ -260,40 +257,43 @@ translation percentage of at least 50%. gpe-todo | | gphoto2 | [] [] [] [] | gprof | [] [] | - gpsdrive | () () | + gpsdrive | | gramadoir | [] [] | - grep | [] [] [] [] [] [] | - gretl | | + grep | [] [] | + gretl | () | gsasl | | gss | | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] [] [] | - gst-plugins-good | [] [] [] [] [] [] [] | + gst-plugins-bad | [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] [] | + gst-plugins-ugly | [] [] | gstreamer | [] [] [] [] [] [] [] | gtick | () | - gtkam | [] [] [] | + gtkam | [] [] [] [] | gtkorphan | [] [] | gtkspell | [] [] [] [] | gutenprint | [] | hello | [] [] [] [] [] | - id-utils | [] [] | - impost | | - indent | [] [] [] | - iso_3166 | [] [] | + herrie | [] | + hylafax | | + idutils | [] [] | + indent | [] [] [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] | iso_3166_2 | | - iso_4217 | [] | - iso_639 | [] [] | + iso_4217 | [] [] [] | + iso_639 | [] [] [] [] | jpilot | [] | jtag | | jwhois | | kbd | [] [] [] [] | - keytouch | | - keytouch-editor | | - keytouch-keyboa... | | + keytouch | [] [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | latrine | () | ld | [] | leafpad | [] [] [] [] [] | - libc | [] [] [] [] [] | + libc | [] [] [] [] | libexif | [] | libextractor | [] | libgpewidget | [] [] [] | @@ -302,76 +302,70 @@ translation percentage of at least 50%. libgphoto2_port | [] [] | libgsasl | | libiconv | [] [] | - libidn | [] [] | + libidn | [] [] [] | lifelines | [] () | lilypond | [] | lingoteach | | + lprng | | lynx | [] [] [] [] | m4 | [] [] [] [] | + mailfromd | | mailutils | [] | make | [] [] | - man-db | [] () [] [] | + man-db | [] [] [] | minicom | [] [] [] | - mysecretdiary | [] [] | nano | [] [] [] | - nano_1_0 | [] () [] [] | opcodes | [] | - parted | | - pilot-qof | [] | + parted | [] [] | + pilot-qof | | + popt | [] [] [] | psmisc | [] | pwdutils | | - python | | qof | | radius | [] | recode | [] [] [] [] [] [] | - rpm | [] [] | + rpm | [] | screem | | scrollkeeper | [] [] [] [] [] [] [] [] | sed | [] [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] | + shared-mime-info | [] [] [] [] () [] [] [] | sharutils | [] [] [] [] [] [] | shishi | | - silky | | skencil | [] () | - sketch | [] () | solfege | | soundtracker | [] [] | sp | [] | - stardict | [] | system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] | + tar | [] [] | texinfo | [] [] [] | - textutils | [] [] [] | tin | () () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | + tuxpaint | [] [] [] [] [] [] | unicode-han-tra... | | unicode-transla... | | util-linux | [] [] [] [] | - vorbis-tools | [] [] [] [] | + util-linux-ng | [] [] [] [] | + vorbis-tools | [] | wastesedge | () | wdiff | [] [] [] [] | - wget | [] [] | - xchat | [] [] [] [] [] [] | - xkeyboard-config | | - xpad | [] [] | + wget | [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] | + xpad | [] [] [] | +----------------------------------------------------+ af am ar az be bg bs ca cs cy da de el en en_GB eo - 10 0 1 2 9 22 1 42 41 2 60 95 16 1 17 16 + 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18 es et eu fa fi fr ga gl gu he hi hr hu id is it +--------------------------------------------------+ - GNUnet | | + Compendium | [] [] [] [] [] | a2ps | [] [] [] () | aegis | | ant-phone | [] | anubis | [] | ap-utils | [] [] | aspell | [] [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | [] | + bash | [] | + bfd | [] [] | bibshelf | [] [] [] | binutils | [] [] [] | bison | [] [] [] [] [] [] | @@ -384,36 +378,32 @@ translation percentage of at least 50%. cpio | [] [] [] | cpplib | [] [] | cryptonit | [] | - darkstat | [] () [] [] [] | - dialog | [] [] [] [] [] [] [] [] | + dialog | [] [] [] | diffutils | [] [] [] [] [] [] [] [] [] | doodle | [] [] | e2fsprogs | [] [] [] | enscript | [] [] [] | - error | [] [] [] [] [] | fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] | + findutils | [] [] [] | + findutils_stable | [] [] [] [] | flex | [] [] [] | - fslint | [] | + fslint | | gas | [] [] | - gawk | [] [] [] [] | - gbiff | [] | + gawk | [] [] [] [] () | gcal | [] [] | gcc | [] | - gettext-examples | [] [] [] [] [] [] | + gettext-examples | [] [] [] [] [] [] [] | gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] | - gip | [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] | gliv | () | glunarclock | [] [] [] | gmult | [] [] [] | gnubiff | () () | gnucash | () () () | - gnucash-glossary | [] [] | gnuedu | [] | - gnulib | [] [] [] [] [] [] [] [] | + gnulib | [] [] [] | + gnunet | | gnunet-gtk | | gnutls | | gpe-aerial | [] [] | @@ -435,68 +425,71 @@ translation percentage of at least 50%. gpe-today | [] [] [] [] | gpe-todo | [] | gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] | - gpsdrive | () () [] () | + gprof | [] [] [] [] [] | + gpsdrive | [] | gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] [] [] | + grep | [] [] [] | + gretl | [] [] [] () | gsasl | [] [] | - gss | [] | - gst-plugins | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | + gss | [] [] | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] | gstreamer | [] [] [] | - gtick | [] | + gtick | [] [] [] | gtkam | [] [] [] [] | gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] | gutenprint | [] | hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] [] | - impost | [] [] | + herrie | [] | + hylafax | | + idutils | [] [] [] [] [] | indent | [] [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] [] | + iso_15924 | [] | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | iso_3166_2 | [] | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] [] | + iso_4217 | [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] | jpilot | [] [] | jtag | [] | jwhois | [] [] [] [] [] | kbd | [] [] | - keytouch | [] | + keytouch | [] [] [] | keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] [] | - ld | [] [] | + keytouch-keyboa... | [] [] | + latrine | [] [] | + ld | [] [] [] [] | leafpad | [] [] [] [] [] [] | libc | [] [] [] [] [] | libexif | [] | libextractor | [] | libgpewidget | [] [] [] [] [] | - libgpg-error | | + libgpg-error | [] | libgphoto2 | [] [] [] | libgphoto2_port | [] [] | libgsasl | [] [] | - libiconv | [] [] | + libiconv | [] [] [] | libidn | [] [] | lifelines | () | - lilypond | [] | + lilypond | [] [] [] | lingoteach | [] [] [] | + lprng | | lynx | [] [] [] | m4 | [] [] [] [] | + mailfromd | | mailutils | [] [] | make | [] [] [] [] [] [] [] [] | - man-db | () | + man-db | [] | minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] [] [] [] [] [] | - nano_1_0 | [] [] [] [] [] | + nano | [] [] [] [] [] [] [] | opcodes | [] [] [] [] | - parted | [] [] [] [] | + parted | [] [] [] | pilot-qof | | - psmisc | [] [] [] | + popt | [] [] [] [] | + psmisc | [] [] | pwdutils | | - python | | qof | [] | radius | [] [] | recode | [] [] [] [] [] [] [] [] | @@ -504,565 +497,539 @@ translation percentage of at least 50%. screem | | scrollkeeper | [] [] [] | sed | [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | shared-mime-info | [] [] [] [] [] [] | sharutils | [] [] [] [] [] [] [] [] | - shishi | | - silky | [] | + shishi | [] | skencil | [] [] | - sketch | [] [] | solfege | [] | soundtracker | [] [] [] | sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] [] [] | - texinfo | [] [] | - textutils | [] [] [] [] [] | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | tin | [] () | - tp-robot | [] [] [] [] | tuxpaint | [] [] | unicode-han-tra... | | unicode-transla... | [] [] | util-linux | [] [] [] [] [] [] [] | - vorbis-tools | [] [] | + util-linux-ng | [] [] [] [] [] [] [] | + vorbis-tools | | wastesedge | () | wdiff | [] [] [] [] [] [] [] [] | wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | xpad | [] [] [] | +--------------------------------------------------+ es et eu fa fi fr ga gl gu he hi hr hu id is it - 88 22 14 2 40 115 61 14 1 8 1 6 59 31 0 52 + 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52 - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - +-------------------------------------------------+ - GNUnet | | - a2ps | () [] [] () | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | - cflow | | - clisp | [] | - console-tools | | - coreutils | [] | - cpio | | - cpplib | [] | - cryptonit | [] | - darkstat | [] [] | - dialog | [] [] | - diffutils | [] [] [] | - doodle | | - e2fsprogs | [] | - enscript | [] | - error | [] | - fetchmail | [] [] | - fileutils | [] [] | - findutils | [] | - flex | [] [] | - fslint | [] [] | - gas | | - gawk | [] [] | - gbiff | [] | - gcal | | - gcc | | - gettext-examples | [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] | - gnubiff | | - gnucash | () () | - gnucash-glossary | [] | - gnuedu | | - gnulib | [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] [] | - gpe-conf | [] [] | - gpe-contacts | [] | - gpe-edit | [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] | - gphoto2 | [] [] | - gprof | | - gpsdrive | () () () | - gramadoir | () | - grep | [] [] [] [] | - gretl | | - gsasl | [] | - gss | | - gst-plugins | [] | - gst-plugins-base | | - gst-plugins-good | [] | - gstreamer | [] | - gtick | | - gtkam | [] | - gtkorphan | [] | - gtkspell | [] [] | - gutenprint | | - hello | [] [] [] [] [] [] | - id-utils | [] | - impost | | - indent | [] [] | - iso_3166 | [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] | - jpilot | () () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | - keytouch-editor | | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] [] [] | - libexif | | - libextractor | | - libgpewidget | [] | - libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | | - libidn | [] [] | - lifelines | [] | - lilypond | | - lingoteach | [] | - lynx | [] [] | - m4 | [] [] | - mailutils | | - make | [] [] [] | - man-db | () | - minicom | [] | - mysecretdiary | [] | - nano | [] [] [] | - nano_1_0 | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] | - shishi | | - silky | [] | - skencil | | - sketch | | - solfege | | - soundtracker | | - sp | () | - stardict | [] [] | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | | - tp-robot | [] | - tuxpaint | [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] | - vorbis-tools | [] | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | - +-------------------------------------------------+ - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - 52 24 2 2 1 3 0 2 3 21 0 15 1 97 5 1 + ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn + +--------------------------------------------------+ + Compendium | [] | + a2ps | () [] [] | + aegis | () | + ant-phone | [] | + anubis | [] [] [] | + ap-utils | [] | + aspell | [] [] | + bash | [] | + bfd | | + bibshelf | [] | + binutils | | + bison | [] [] [] | + bison-runtime | [] [] [] | + bluez-pin | [] [] [] | + cflow | | + clisp | [] | + console-tools | | + coreutils | [] | + cpio | [] | + cpplib | [] | + cryptonit | [] | + dialog | [] [] | + diffutils | [] [] [] | + doodle | | + e2fsprogs | [] | + enscript | [] | + fetchmail | [] [] | + findutils | [] | + findutils_stable | [] | + flex | [] [] | + fslint | | + gas | | + gawk | [] [] | + gcal | | + gcc | | + gettext-examples | [] [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gip | [] [] | + gliv | [] | + glunarclock | [] [] | + gmult | [] [] [] | + gnubiff | | + gnucash | () () () | + gnuedu | | + gnulib | [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] | + gpe-clock | [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] | + gphoto2 | [] [] | + gprof | [] | + gpsdrive | [] | + gramadoir | () | + grep | [] [] | + gretl | | + gsasl | [] | + gss | | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] | + gtick | [] | + gtkam | [] [] | + gtkorphan | [] | + gtkspell | [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] | + herrie | [] | + hylafax | | + idutils | [] | + indent | [] [] | + iso_15924 | [] | + iso_3166 | [] [] [] [] [] [] [] [] | + iso_3166_2 | [] | + iso_4217 | [] [] [] | + iso_639 | [] [] [] [] | + jpilot | () () | + jtag | | + jwhois | [] | + kbd | [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | | + latrine | [] | + ld | | + leafpad | [] [] | + libc | [] [] [] | + libexif | | + libextractor | | + libgpewidget | [] | + libgpg-error | | + libgphoto2 | [] | + libgphoto2_port | [] | + libgsasl | [] | + libiconv | [] | + libidn | [] [] | + lifelines | [] | + lilypond | [] | + lingoteach | [] | + lprng | | + lynx | [] [] | + m4 | [] [] | + mailfromd | | + mailutils | | + make | [] [] [] | + man-db | | + minicom | [] | + nano | [] [] [] | + opcodes | [] | + parted | [] [] | + pilot-qof | | + popt | [] [] [] | + psmisc | [] [] [] | + pwdutils | | + qof | | + radius | | + recode | [] | + rpm | [] [] | + screem | [] | + scrollkeeper | [] [] [] [] | + sed | [] [] | + shared-mime-info | [] [] [] [] [] [] [] | + sharutils | [] [] | + shishi | | + skencil | | + solfege | () () | + soundtracker | | + sp | () | + system-tools-ba... | [] [] [] [] | + tar | [] [] [] | + texinfo | [] [] | + tin | | + tuxpaint | () [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] | + util-linux-ng | [] [] | + vorbis-tools | | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] | + xchat | [] [] [] [] | + xkeyboard-config | [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn + 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6 - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +------------------------------------------------------+ - GNUnet | | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - darkstat | [] [] [] [] [] [] | - dialog | [] [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] [] | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] [] [] [] | - gas | | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gimp-print | [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () | - gnucash | () [] | - gnucash-glossary | [] [] [] | - gnuedu | | - gnulib | [] [] [] [] [] | - gnunet-gtk | [] | - gnutls | [] [] | - gpe-aerial | [] [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] | - gpe-clock | [] [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] [] | - gpe-contacts | [] [] [] [] [] | - gpe-edit | [] [] [] [] [] [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] [] | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] | - gretl | [] | - gsasl | [] [] [] | - gss | [] [] [] | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] | - gst-plugins-good | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] | - gtkam | [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - impost | [] | - indent | [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] | - ld | [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] [] | - libgpewidget | [] [] [] [] [] [] [] | - libgpg-error | [] [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] | - libidn | [] [] () | - lifelines | [] [] | - lilypond | | - lingoteach | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailutils | [] [] [] [] | - make | [] [] [] [] | - man-db | [] [] | - minicom | [] [] [] [] [] | - mysecretdiary | [] [] [] [] | - nano | [] [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | [] | - psmisc | [] [] | - pwdutils | [] [] | - python | | - qof | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - silky | [] | - skencil | [] [] [] | - sketch | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - stardict | [] [] [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] | - tin | () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] | - xpad | [] [] [] | - +------------------------------------------------------+ - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 2 3 58 30 54 5 73 72 4 40 46 11 50 128 2 + or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + +--------------------------------------------------+ + Compendium | [] [] [] [] [] | + a2ps | () [] [] [] [] [] [] | + aegis | () () | + ant-phone | [] [] | + anubis | [] [] [] | + ap-utils | () | + aspell | [] [] [] | + bash | [] [] | + bfd | | + bibshelf | [] | + binutils | [] [] | + bison | [] [] [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] [] | + cflow | [] | + clisp | [] | + console-tools | [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + cpplib | [] | + cryptonit | [] [] | + dialog | [] | + diffutils | [] [] [] [] [] [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + fetchmail | [] [] [] | + findutils | [] [] [] | + findutils_stable | [] [] [] [] [] [] | + flex | [] [] [] [] [] | + fslint | [] | + gas | | + gawk | [] [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] [] | + gip | [] [] [] [] | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] [] | + gmult | [] [] [] [] | + gnubiff | () [] | + gnucash | () [] | + gnuedu | | + gnulib | [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] [] [] [] [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] [] [] [] [] [] | + gpe-login | [] [] [] [] [] [] [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] | + gramadoir | [] [] | + grep | [] [] [] [] | + gretl | [] [] [] | + gsasl | [] [] [] | + gss | [] [] [] [] | + gst-plugins-bad | [] [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] | + gstreamer | [] [] [] [] | + gtick | [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] [] | + herrie | [] [] [] | + hylafax | | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] | + jpilot | | + jtag | [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + latrine | | + ld | [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] | + libextractor | [] [] | + libgpewidget | [] [] [] [] [] [] [] [] | + libgpg-error | [] [] [] | + libgphoto2 | [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] | + libidn | [] [] () | + lifelines | [] [] | + lilypond | | + lingoteach | [] | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] [] [] | + make | [] [] [] [] | + man-db | [] [] [] [] | + minicom | [] [] [] [] [] | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] | + pilot-qof | | + popt | [] [] [] [] | + psmisc | [] [] | + pwdutils | [] [] | + qof | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + rpm | [] [] [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + shared-mime-info | [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] [] | + solfege | [] | + soundtracker | [] [] | + sp | | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | () | + tuxpaint | [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] | + util-linux-ng | [] [] [] [] | + vorbis-tools | [] | + wastesedge | | + wdiff | [] [] [] [] [] [] [] | + wget | [] [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu +---------------------------------------------------+ - GNUnet | [] | 2 + Compendium | [] [] [] [] | 19 a2ps | [] [] [] | 19 - aegis | | 0 + aegis | [] | 1 ant-phone | [] [] | 6 anubis | [] [] [] | 11 ap-utils | () [] | 4 - aspell | [] [] [] | 15 - bash | [] | 11 - batchelor | [] [] | 9 - bfd | | 1 + aspell | [] [] [] | 16 + bash | [] | 6 + bfd | | 2 bibshelf | [] | 7 - binutils | [] [] [] | 9 - bison | [] [] [] | 19 - bison-runtime | [] [] [] | 15 + binutils | [] [] [] [] | 9 + bison | [] [] [] [] | 20 + bison-runtime | [] [] [] [] | 18 bluez-pin | [] [] [] [] [] [] | 28 cflow | [] [] | 5 - clisp | | 6 + clisp | | 9 console-tools | [] [] | 5 - coreutils | [] [] | 16 - cpio | [] [] [] | 9 - cpplib | [] [] [] [] | 11 - cryptonit | | 5 - darkstat | [] () () | 15 - dialog | [] [] [] [] [] | 30 - diffutils | [] [] [] [] | 28 + coreutils | [] [] [] | 18 + cpio | [] [] [] [] | 11 + cpplib | [] [] [] [] [] | 12 + cryptonit | [] | 6 + dialog | [] [] [] | 9 + diffutils | [] [] [] [] [] | 29 doodle | [] | 6 e2fsprogs | [] [] | 10 enscript | [] [] [] | 16 - error | [] [] [] [] | 18 fetchmail | [] [] | 12 - fileutils | [] [] [] | 18 - findutils | [] [] [] | 17 + findutils | [] [] [] | 11 + findutils_stable | [] [] [] [] | 18 flex | [] [] | 15 - fslint | [] | 9 + fslint | [] | 2 gas | [] | 3 - gawk | [] [] | 15 - gbiff | [] | 5 + gawk | [] [] [] | 16 gcal | [] | 5 - gcc | [] [] [] | 6 - gettext-examples | [] [] [] [] [] [] | 27 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] | 29 gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 19 - gimp-print | [] [] | 12 - gip | [] [] | 12 - gliv | [] [] | 8 + gettext-tools | [] [] [] [] [] | 20 + gip | [] [] | 13 + gliv | [] [] | 11 glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 15 - gnubiff | [] | 1 - gnucash | () | 2 - gnucash-glossary | [] [] | 9 + gmult | [] [] [] [] | 16 + gnubiff | [] | 2 + gnucash | () [] | 5 gnuedu | [] | 2 - gnulib | [] [] [] [] [] | 28 - gnunet-gtk | | 1 - gnutls | | 2 + gnulib | [] | 10 + gnunet | | 0 + gnunet-gtk | [] [] | 3 + gnutls | | 4 gpe-aerial | [] [] | 14 gpe-beam | [] [] | 14 - gpe-calendar | [] | 3 + gpe-calendar | [] [] | 7 gpe-clock | [] [] [] [] | 21 - gpe-conf | [] [] | 14 + gpe-conf | [] [] [] | 16 gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] | 20 - gpe-filemanager | [] | 6 - gpe-go | [] [] | 15 + gpe-edit | [] [] [] [] [] | 22 + gpe-filemanager | [] [] | 7 + gpe-go | [] [] [] [] | 19 gpe-login | [] [] [] [] [] | 21 gpe-ownerinfo | [] [] [] [] | 21 gpe-package | [] | 6 gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] | 20 - gpe-taskmanager | [] [] [] | 20 + gpe-su | [] [] [] [] | 21 + gpe-taskmanager | [] [] [] [] | 21 gpe-timesheet | [] [] [] [] | 18 gpe-today | [] [] [] [] [] | 21 - gpe-todo | [] | 7 - gphoto2 | [] [] [] [] | 20 - gprof | [] [] | 11 - gpsdrive | | 4 + gpe-todo | [] [] | 8 + gphoto2 | [] [] [] [] | 21 + gprof | [] [] | 13 + gpsdrive | [] | 5 gramadoir | [] | 7 - grep | [] [] [] [] | 34 - gretl | | 4 - gsasl | [] [] | 8 - gss | [] | 5 - gst-plugins | [] [] [] | 15 - gst-plugins-base | [] [] [] | 9 - gst-plugins-good | [] [] [] [] [] | 20 - gstreamer | [] [] [] | 17 - gtick | [] | 3 - gtkam | [] | 13 + grep | [] | 12 + gretl | | 6 + gsasl | [] [] [] | 9 + gss | [] | 7 + gst-plugins-bad | [] [] [] | 13 + gst-plugins-base | [] [] | 11 + gst-plugins-good | [] [] [] [] [] | 16 + gst-plugins-ugly | [] [] [] | 13 + gstreamer | [] [] [] | 18 + gtick | [] [] | 7 + gtkam | [] | 16 gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 26 - gutenprint | | 3 - hello | [] [] [] [] [] | 37 - id-utils | [] [] | 14 - impost | [] | 4 - indent | [] [] [] [] | 25 - iso_3166 | [] [] [] [] | 16 - iso_3166_2 | | 2 - iso_4217 | [] [] | 14 - iso_639 | [] | 14 + gtkspell | [] [] [] [] [] [] | 27 + gutenprint | | 4 + hello | [] [] [] [] [] | 38 + herrie | [] [] | 8 + hylafax | | 0 + idutils | [] [] | 15 + indent | [] [] [] [] [] | 28 + iso_15924 | [] [] | 4 + iso_3166 | [] [] [] [] [] [] [] [] [] | 54 + iso_3166_2 | [] [] | 4 + iso_4217 | [] [] [] [] [] | 24 + iso_639 | [] [] [] [] [] | 26 jpilot | [] [] [] [] | 7 jtag | [] | 3 jwhois | [] [] [] | 13 - kbd | [] [] | 12 - keytouch | [] | 4 - keytouch-editor | | 2 - keytouch-keyboa... | [] | 3 - latrine | [] [] | 8 - ld | [] [] [] [] | 8 - leafpad | [] [] [] [] | 23 - libc | [] [] [] | 23 - libexif | [] | 4 + kbd | [] [] [] | 13 + keytouch | [] | 8 + keytouch-editor | [] | 5 + keytouch-keyboa... | [] | 5 + latrine | [] [] | 5 + ld | [] [] [] [] | 10 + leafpad | [] [] [] [] [] | 24 + libc | [] [] [] | 19 + libexif | [] | 5 libextractor | [] | 5 - libgpewidget | [] [] [] | 19 - libgpg-error | [] | 4 - libgphoto2 | [] | 8 + libgpewidget | [] [] [] | 20 + libgpg-error | [] | 6 + libgphoto2 | [] [] | 9 libgphoto2_port | [] [] [] | 11 libgsasl | [] | 8 - libiconv | [] | 7 - libidn | [] [] | 10 + libiconv | [] [] | 11 + libidn | [] [] | 11 lifelines | | 4 - lilypond | | 2 + lilypond | [] | 6 lingoteach | [] | 6 + lprng | [] | 2 lynx | [] [] [] | 15 m4 | [] [] [] | 18 - mailutils | [] | 8 + mailfromd | [] [] | 3 + mailutils | [] [] | 8 make | [] [] [] | 20 - man-db | [] | 6 + man-db | [] | 9 minicom | [] | 14 - mysecretdiary | [] [] | 12 - nano | [] [] | 17 - nano_1_0 | [] [] [] | 18 + nano | [] [] [] | 20 opcodes | [] [] | 10 - parted | [] [] [] | 10 - pilot-qof | [] | 3 - psmisc | [] | 10 + parted | [] [] [] | 11 + pilot-qof | [] | 1 + popt | [] [] [] [] | 18 + psmisc | [] [] | 10 pwdutils | [] | 3 - python | | 0 qof | [] | 4 - radius | [] | 6 + radius | [] [] | 7 recode | [] [] [] | 25 - rpm | [] [] [] [] | 14 + rpm | [] [] [] [] | 13 screem | [] | 2 scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] | 22 - sh-utils | [] | 15 - shared-mime-info | [] [] [] [] | 24 + sed | [] [] [] [] | 23 + shared-mime-info | [] [] [] | 29 sharutils | [] [] [] | 23 - shishi | | 1 - silky | [] | 4 + shishi | [] | 3 skencil | [] | 7 - sketch | | 6 - solfege | | 2 + solfege | [] | 3 soundtracker | [] [] | 9 sp | [] | 3 - stardict | [] [] [] [] | 11 - system-tools-ba... | [] [] [] [] [] [] [] | 37 - tar | [] [] [] [] | 20 + system-tools-ba... | [] [] [] [] [] [] [] | 38 + tar | [] [] [] | 17 texinfo | [] [] [] | 15 - textutils | [] [] [] | 17 tin | | 1 - tp-robot | [] [] [] | 10 - tuxpaint | [] [] [] | 16 + tuxpaint | [] [] [] | 19 unicode-han-tra... | | 0 unicode-transla... | | 2 util-linux | [] [] [] | 20 - vorbis-tools | [] [] | 11 + util-linux-ng | [] [] [] | 20 + vorbis-tools | [] [] | 4 wastesedge | | 1 - wdiff | [] [] | 22 - wget | [] [] [] | 19 + wdiff | [] [] | 23 + wget | [] [] [] | 20 xchat | [] [] [] [] | 29 - xkeyboard-config | [] [] [] [] | 11 - xpad | [] [] [] | 14 + xkeyboard-config | [] [] [] | 14 + xpad | [] [] [] | 15 +---------------------------------------------------+ - 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 170 domains 0 1 1 77 39 0 136 10 1 48 5 54 0 2028 + 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -1075,10 +1042,10 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If October 2006 seems to be old, you may fetch a more recent copy of -this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date -matrix with full percentage details can be found at -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. + If November 2007 seems to be old, you may fetch a more recent copy +of this `ABOUT-NLS' file on most GNU archive sites. The most +up-to-date matrix with full percentage details can be found at +`http://translationproject.org/extra/matrix.html'. 1.6 Using `gettext' in new packages =================================== @@ -1096,6 +1063,6 @@ the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact -`translation@iro.umontreal.ca' to make the `.pot' files available to -the translation teams. +`coordinator@translationproject.org' to make the `.pot' files available +to the translation teams. diff --git a/gettext-runtime/intl/plural.c b/gettext-runtime/intl/plural.c index 5f73b403f..7a4d947a2 100644 --- a/gettext-runtime/intl/plural.c +++ b/gettext-runtime/intl/plural.c @@ -1,25 +1,79 @@ -/* A Bison parser, made from plural.y - by GNU bison 1.35. */ +/* A Bison parser, made by GNU Bison 2.3a. */ -#define YYBISON 1 /* Identify Bison output. */ +/* Skeleton implementation for Bison's Yacc-like parsers in C + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Bison version. */ +#define YYBISON_VERSION "2.3a" + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 1 + +/* Using locations. */ +#define YYLSP_NEEDED 0 + +/* Substitute the variable and function names. */ #define yyparse __gettextparse -#define yylex __gettextlex +#define yylex __gettextlex #define yyerror __gettexterror -#define yylval __gettextlval -#define yychar __gettextchar +#define yylval __gettextlval +#define yychar __gettextchar #define yydebug __gettextdebug #define yynerrs __gettextnerrs -# define EQUOP2 257 -# define CMPOP2 258 -# define ADDOP2 259 -# define MULOP2 260 -# define NUMBER 261 + +/* Copy the first part of user declarations. */ +/* Line 164 of yacc.c. */ #line 1 "plural.y" /* Expression parsing for plural form selection. - Copyright (C) 2000-2001, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. This program is free software; you can redistribute it and/or modify it @@ -64,16 +118,71 @@ #define YYLEX_PARAM &((struct parse_args *) arg)->cp #define YYPARSE_PARAM arg + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + EQUOP2 = 258, + CMPOP2 = 259, + ADDOP2 = 260, + MULOP2 = 261, + NUMBER = 262 + }; +#endif +/* Tokens. */ +#define EQUOP2 258 +#define CMPOP2 259 +#define ADDOP2 260 +#define MULOP2 261 +#define NUMBER 262 + + + + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +{/* Line 191 of yacc.c. */ #line 51 "plural.y" -#ifndef YYSTYPE -typedef union { + unsigned long int num; - enum operator op; + enum expression_operator op; struct expression *exp; -} yystype; -# define YYSTYPE yystype +} +/* Line 191 of yacc.c. */ +#line 175 "plural.c" + YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 #endif + + + + +/* Copy the second part of user declarations. */ +/* Line 221 of yacc.c. */ #line 57 "plural.y" /* Prototypes for local functions. */ @@ -83,7 +192,8 @@ static void yyerror (const char *str); /* Allocation of expressions. */ static struct expression * -new_exp (int nargs, enum operator op, struct expression * const *args) +new_exp (int nargs, enum expression_operator op, + struct expression * const *args) { int i; struct expression *newp; @@ -112,13 +222,13 @@ new_exp (int nargs, enum operator op, struct expression * const *args) } static inline struct expression * -new_exp_0 (enum operator op) +new_exp_0 (enum expression_operator op) { return new_exp (0, op, NULL); } static inline struct expression * -new_exp_1 (enum operator op, struct expression *right) +new_exp_1 (enum expression_operator op, struct expression *right) { struct expression *args[1]; @@ -127,7 +237,8 @@ new_exp_1 (enum operator op, struct expression *right) } static struct expression * -new_exp_2 (enum operator op, struct expression *left, struct expression *right) +new_exp_2 (enum expression_operator op, struct expression *left, + struct expression *right) { struct expression *args[2]; @@ -137,7 +248,7 @@ new_exp_2 (enum operator op, struct expression *left, struct expression *right) } static inline struct expression * -new_exp_3 (enum operator op, struct expression *bexp, +new_exp_3 (enum expression_operator op, struct expression *bexp, struct expression *tbranch, struct expression *fbranch) { struct expression *args[3]; @@ -148,271 +259,199 @@ new_exp_3 (enum operator op, struct expression *bexp, return new_exp (3, op, args); } -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif - - -#define YYFINAL 27 -#define YYFLAG -32768 -#define YYNTBASE 16 - -/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */ -#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18) - -/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */ -static const char yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 10, 2, 2, 2, 2, 5, 2, - 14, 15, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 12, 2, - 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 13, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 4, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 6, 7, 8, - 9, 11 -}; - -#if YYDEBUG -static const short yyprhs[] = -{ - 0, 0, 2, 8, 12, 16, 20, 24, 28, 32, - 35, 37, 39 -}; -static const short yyrhs[] = -{ - 17, 0, 17, 3, 17, 12, 17, 0, 17, 4, - 17, 0, 17, 5, 17, 0, 17, 6, 17, 0, - 17, 7, 17, 0, 17, 8, 17, 0, 17, 9, - 17, 0, 10, 17, 0, 13, 0, 11, 0, 14, - 17, 15, 0 -}; +/* Line 221 of yacc.c. */ +#line 265 "plural.c" +#ifdef short +# undef short #endif -#if YYDEBUG -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const short yyrline[] = -{ - 0, 152, 160, 164, 168, 172, 176, 180, 184, 188, - 192, 196, 201 -}; +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; #endif - -#if (YYDEBUG) || defined YYERROR_VERBOSE - -/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ -static const char *const yytname[] = -{ - "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2", - "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'", - "start", "exp", 0 -}; +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; #endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const short yyr1[] = -{ - 0, 16, 17, 17, 17, 17, 17, 17, 17, 17, - 17, 17, 17 -}; - -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const short yyr2[] = -{ - 0, 1, 5, 3, 3, 3, 3, 3, 3, 2, - 1, 1, 3 -}; - -/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE - doesn't specify something else to do. Zero means the default is an - error. */ -static const short yydefact[] = -{ - 0, 0, 11, 10, 0, 1, 9, 0, 0, 0, - 0, 0, 0, 0, 0, 12, 0, 3, 4, 5, - 6, 7, 8, 0, 2, 0, 0, 0 -}; - -static const short yydefgoto[] = -{ - 25, 5 -}; - -static const short yypact[] = -{ - -9, -9,-32768,-32768, -9, 34,-32768, 11, -9, -9, - -9, -9, -9, -9, -9,-32768, 24, 39, 43, 16, - 26, -3,-32768, -9, 34, 21, 53,-32768 -}; +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif -static const short yypgoto[] = -{ - -32768, -1 -}; +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif -#define YYLAST 53 +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif +# endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif -static const short yytable[] = -{ - 6, 1, 2, 7, 3, 4, 14, 16, 17, 18, - 19, 20, 21, 22, 8, 9, 10, 11, 12, 13, - 14, 26, 24, 12, 13, 14, 15, 8, 9, 10, - 11, 12, 13, 14, 13, 14, 23, 8, 9, 10, - 11, 12, 13, 14, 10, 11, 12, 13, 14, 11, - 12, 13, 14, 27 -}; +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ +#endif -static const short yycheck[] = +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int yyi) +#else +static int +YYID (yyi) + int yyi; +#endif { - 1, 10, 11, 4, 13, 14, 9, 8, 9, 10, - 11, 12, 13, 14, 3, 4, 5, 6, 7, 8, - 9, 0, 23, 7, 8, 9, 15, 3, 4, 5, - 6, 7, 8, 9, 8, 9, 12, 3, 4, 5, - 6, 7, 8, 9, 5, 6, 7, 8, 9, 6, - 7, 8, 9, 0 -}; -#define YYPURE 1 - -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "bison.simple" - -/* Skeleton output parser for bison, - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software - Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* This is the parser code that is written into each bison parser when - the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ + return yyi; +} +#endif -#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE) +#if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ -# if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# else -# ifndef YYSTACK_USE_ALLOCA -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca # else -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif # endif # endif # endif # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +# endif # else -# if defined (__STDC__) || defined (__cplusplus) +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif # endif -# define YYSTACK_ALLOC malloc -# define YYSTACK_FREE free # endif -#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */ +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ -#if (! defined (yyoverflow) \ - && (! defined (__cplusplus) \ - || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - short yyss; + yytype_int16 yyss; YYSTYPE yyvs; -# if YYLSP_NEEDED - YYLTYPE yyls; -# endif -}; + }; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ -# if YYLSP_NEEDED -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAX) -# else -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAX) -# endif +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY -# if 1 < __GNUC__ +# if defined __GNUC__ && 1 < __GNUC__ # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else # define YYCOPY(To, From, Count) \ do \ { \ - register YYSIZE_T yyi; \ + YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ - while (0) + while (YYID (0)) # endif # endif @@ -427,98 +466,284 @@ union yyalloc YYSIZE_T yynewbytes; \ YYCOPY (&yyptr->Stack, Stack, yysize); \ Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ - while (0) + while (YYID (0)) #endif +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 9 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 54 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 16 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 3 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 13 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 27 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 262 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const yytype_uint8 yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 10, 2, 2, 2, 2, 5, 2, + 14, 15, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 12, 2, + 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 13, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 4, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 6, 7, + 8, 9, 11 +}; + +#if YYDEBUG +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint8 yyprhs[] = +{ + 0, 0, 3, 5, 11, 15, 19, 23, 27, 31, + 35, 38, 40, 42 +}; -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int8 yyrhs[] = +{ + 17, 0, -1, 18, -1, 18, 3, 18, 12, 18, + -1, 18, 4, 18, -1, 18, 5, 18, -1, 18, + 6, 18, -1, 18, 7, 18, -1, 18, 8, 18, + -1, 18, 9, 18, -1, 10, 18, -1, 13, -1, + 11, -1, 14, 18, 15, -1 +}; + +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const yytype_uint8 yyrline[] = +{ + 0, 154, 154, 162, 166, 170, 174, 178, 182, 186, + 190, 194, 198, 203 +}; #endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t + +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2", + "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'", + "$accept", "start", "exp", 0 +}; #endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t + +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const yytype_uint16 yytoknum[] = +{ + 0, 256, 257, 63, 124, 38, 258, 259, 260, 261, + 33, 262, 58, 110, 40, 41 +}; # endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif + +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 16, 17, 18, 18, 18, 18, 18, 18, 18, + 18, 18, 18, 18 +}; + +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 5, 3, 3, 3, 3, 3, 3, + 2, 1, 1, 3 +}; + +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 0, 0, 12, 11, 0, 0, 2, 10, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, + 5, 6, 7, 8, 9, 0, 3 +}; + +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + -1, 5, 6 +}; + +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -10 +static const yytype_int8 yypact[] = +{ + -9, -9, -10, -10, -9, 8, 36, -10, 13, -10, + -9, -9, -9, -9, -9, -9, -9, -10, 26, 41, + 45, 18, -2, 14, -10, -9, 36 +}; + +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = +{ + -10, -10, -1 +}; + +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -1 +static const yytype_uint8 yytable[] = +{ + 7, 1, 2, 8, 3, 4, 15, 16, 9, 18, + 19, 20, 21, 22, 23, 24, 10, 11, 12, 13, + 14, 15, 16, 16, 26, 14, 15, 16, 17, 10, + 11, 12, 13, 14, 15, 16, 0, 0, 25, 10, + 11, 12, 13, 14, 15, 16, 12, 13, 14, 15, + 16, 13, 14, 15, 16 +}; + +static const yytype_int8 yycheck[] = +{ + 1, 10, 11, 4, 13, 14, 8, 9, 0, 10, + 11, 12, 13, 14, 15, 16, 3, 4, 5, 6, + 7, 8, 9, 9, 25, 7, 8, 9, 15, 3, + 4, 5, 6, 7, 8, 9, -1, -1, 12, 3, + 4, 5, 6, 7, 8, 9, 5, 6, 7, 8, + 9, 6, 7, 8, 9 +}; + +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = +{ + 0, 10, 11, 13, 14, 17, 18, 18, 18, 0, + 3, 4, 5, 6, 7, 8, 9, 15, 18, 18, + 18, 18, 18, 18, 18, 12, 18 +}; #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) -#define YYEMPTY -2 +#define YYEMPTY (-2) #define YYEOF 0 + #define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ + #define YYFAIL goto yyerrlab + #define YYRECOVERING() (!!yyerrstatus) + #define YYBACKUP(Token, Value) \ do \ if (yychar == YYEMPTY && yylen == 1) \ { \ yychar = (Token); \ yylval = (Value); \ - yychar1 = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK (1); \ goto yybackup; \ } \ else \ - { \ - yyerror ("syntax error: cannot back up"); \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ -while (0) +while (YYID (0)) + #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). - - When YYLLOC_DEFAULT is run, CURRENT is set the location of the - first token. By default, to implement support for ranges, extend - its range to the last symbol. */ +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.last_line = Rhs[N].last_line; \ - Current.last_column = Rhs[N].last_column; +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (YYID (0)) #endif -/* YYLEX -- calling `yylex' with the right arguments. */ +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ -#if YYPURE -# if YYLSP_NEEDED -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval, &yylloc) -# endif -# else /* !YYLSP_NEEDED */ -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval) -# endif -# endif /* !YYLSP_NEEDED */ -#else /* !YYPURE */ -# define YYLEX yylex () -#endif /* !YYPURE */ +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif +/* YYLEX -- calling `yylex' with the right arguments. */ + +#ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, YYLEX_PARAM) +#else +# define YYLEX yylex (&yylval) +#endif + /* Enable debugging if requested. */ #if YYDEBUG @@ -531,14 +756,158 @@ while (0) do { \ if (yydebug) \ YYFPRINTF Args; \ -} while (0) +} while (YYID (0)) + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +#else +static void +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (YYID (0)) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +#else +static void +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; + int yyrule; +#endif +{ + int yynrhs = yyr2[yyrule]; + int yyi; + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + fprintf (stderr, "\n"); + } +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) + /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ + /* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH # define YYINITDEPTH 200 @@ -548,59 +917,59 @@ int yydebug; if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if YYMAXDEPTH == 0 -# undef YYMAXDEPTH -#endif - #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif + -#ifdef YYERROR_VERBOSE + +#if YYERROR_VERBOSE # ifndef yystrlen -# if defined (__GLIBC__) && defined (_STRING_H) +# if defined __GLIBC__ && defined _STRING_H # define yystrlen strlen # else /* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static YYSIZE_T -# if defined (__STDC__) || defined (__cplusplus) yystrlen (const char *yystr) -# else +#else +static YYSIZE_T yystrlen (yystr) - const char *yystr; -# endif + const char *yystr; +#endif { - register const char *yys = yystr; - - while (*yys++ != '\0') + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) continue; - - return yys - yystr - 1; + return yylen; } # endif # endif # ifndef yystpcpy -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static char * -# if defined (__STDC__) || defined (__cplusplus) yystpcpy (char *yydest, const char *yysrc) -# else +#else +static char * yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -# endif + char *yydest; + const char *yysrc; +#endif { - register char *yyd = yydest; - register const char *yys = yysrc; + char *yyd = yydest; + const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -609,86 +978,266 @@ yystpcpy (yydest, yysrc) } # endif # endif -#endif - -#line 315 "bison.simple" +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ + if (! yyres) + return yystrlen (yystr); -#ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) -# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -# define YYPARSE_PARAM_DECL -# else -# define YYPARSE_PARAM_ARG YYPARSE_PARAM -# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; + return yystpcpy (yyres, yystr) - yyres; +} # endif -#else /* !YYPARSE_PARAM */ -# define YYPARSE_PARAM_ARG -# define YYPARSE_PARAM_DECL -#endif /* !YYPARSE_PARAM */ - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -# ifdef YYPARSE_PARAM -int yyparse (void *); -# else -int yyparse (void); + +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) +{ + int yyn = yypact[yystate]; + + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); # endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } +} +#endif /* YYERROR_VERBOSE */ + + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +#else +static void +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; + int yytype; + YYSTYPE *yyvaluep; #endif +{ + YYUSE (yyvaluep); -/* YY_DECL_VARIABLES -- depending whether we use a pure parser, - variables are global, or local to YYPARSE. */ - -#define YY_DECL_NON_LSP_VARIABLES \ -/* The lookahead symbol. */ \ -int yychar; \ - \ -/* The semantic value of the lookahead symbol. */ \ -YYSTYPE yylval; \ - \ -/* Number of parse errors so far. */ \ -int yynerrs; + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + + switch (yytype) + { + + default: + break; + } +} + + +/* Prevent warnings from -Wmissing-prototypes. */ -#if YYLSP_NEEDED -# define YY_DECL_VARIABLES \ -YY_DECL_NON_LSP_VARIABLES \ - \ -/* Location data for the lookahead symbol. */ \ -YYLTYPE yylloc; +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); #else -# define YY_DECL_VARIABLES \ -YY_DECL_NON_LSP_VARIABLES +int yyparse (); #endif +#endif /* ! YYPARSE_PARAM */ -/* If nonreentrant, generate the variables here. */ -#if !YYPURE -YY_DECL_VARIABLES -#endif /* !YYPURE */ + + +/*----------. +| yyparse. | +`----------*/ + +#ifdef YYPARSE_PARAM +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) int -yyparse (YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL +yyparse (void *YYPARSE_PARAM) +#else +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +#endif +#else /* ! YYPARSE_PARAM */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void) +#else +int +yyparse () + +#endif +#endif { - /* If reentrant, generate the variables here. */ -#if YYPURE - YY_DECL_VARIABLES -#endif /* !YYPURE */ + /* The lookahead symbol. */ +int yychar; + +/* The semantic value of the lookahead symbol. */ +YYSTYPE yylval; + +/* Number of syntax errors so far. */ +int yynerrs; - register int yystate; - register int yyn; + int yystate; + int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; /* Lookahead token as an internal (translated) token number. */ - int yychar1 = 0; + int yytoken = 0; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif /* Three stacks and their tools: `yyss': related to states, @@ -698,42 +1247,30 @@ yyparse (YYPARSE_PARAM_ARG) Refer to the stacks thru separate pointers, to allow yyoverflow to reallocate them elsewhere. */ - /* The state stack. */ - short yyssa[YYINITDEPTH]; - short *yyss = yyssa; - register short *yyssp; + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - register YYSTYPE *yyvsp; + YYSTYPE *yyvsp; -#if YYLSP_NEEDED - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; -#endif -#if YYLSP_NEEDED -# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) -#else -# define YYPOPSTACK (yyvsp--, yyssp--) -#endif - YYSIZE_T yystacksize = YYINITDEPTH; +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + YYSIZE_T yystacksize = YYINITDEPTH; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; -#if YYLSP_NEEDED - YYLTYPE yyloc; -#endif - /* When reducing, the number of symbols on the RHS of the reduced - rule. */ - int yylen; + + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; YYDPRINTF ((stderr, "Starting parse\n")); @@ -749,9 +1286,7 @@ yyparse (YYPARSE_PARAM_ARG) yyssp = yyss; yyvsp = yyvs; -#if YYLSP_NEEDED - yylsp = yyls; -#endif + goto yysetstate; /*------------------------------------------------------------. @@ -759,70 +1294,60 @@ yyparse (YYPARSE_PARAM_ARG) `------------------------------------------------------------*/ yynewstate: /* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. - */ + have just been pushed. So pushing a state here evens the stacks. */ yyssp++; yysetstate: *yyssp = yystate; - if (yyssp >= yyss + yystacksize - 1) + if (yyss + yystacksize - 1 <= yyssp) { /* Get the current used size of the three stacks, in elements. */ YYSIZE_T yysize = yyssp - yyss + 1; #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of + /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; + /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. */ -# if YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow ("parser stack overflow", - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), - &yystacksize); - yyls = yyls1; -# else - yyoverflow ("parser stack overflow", + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); -# endif + yyss = yyss1; yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyoverflowlab; + goto yyexhaustedlab; # else /* Extend the stack our own way. */ - if (yystacksize >= YYMAXDEPTH) - goto yyoverflowlab; + if (YYMAXDEPTH <= yystacksize) + goto yyexhaustedlab; yystacksize *= 2; - if (yystacksize > YYMAXDEPTH) + if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - short *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyoverflowlab; + goto yyexhaustedlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); -# if YYLSP_NEEDED - YYSTACK_RELOCATE (yyls); -# endif -# undef YYSTACK_RELOCATE + +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } @@ -831,123 +1356,83 @@ yyparse (YYPARSE_PARAM_ARG) yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; -#if YYLSP_NEEDED - yylsp = yyls + yysize - 1; -#endif + YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); - if (yyssp >= yyss + yystacksize - 1) + if (yyss + yystacksize - 1 <= yyssp) YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - goto yybackup; + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. | yybackup. | `-----------*/ yybackup: -/* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ -/* yyresume: */ + /* Do appropriate processing given the current state. Read a + lookahead token if we need one and don't already have one. */ /* First try to decide what to do without reference to lookahead token. */ - yyn = yypact[yystate]; - if (yyn == YYFLAG) + if (yyn == YYPACT_NINF) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ - /* yychar is either YYEMPTY or YYEOF - or a valid token in external form. */ - + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; } - /* Convert token to internal form (in yychar1) for indexing tables with */ - - if (yychar <= 0) /* This means end of input. */ + if (yychar <= YYEOF) { - yychar1 = 0; - yychar = YYEOF; /* Don't call YYLEX any more */ - + yychar = yytoken = YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } else { - yychar1 = YYTRANSLATE (yychar); - -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables - which are defined only if `YYDEBUG' is set. */ - if (yydebug) - { - YYFPRINTF (stderr, "Next token is %d (%s", - yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise - meaning of a token, for further debugging info. */ -# ifdef YYPRINT - YYPRINT (stderr, yychar, yylval); -# endif - YYFPRINTF (stderr, ")\n"); - } -#endif + yytoken = YYTRANSLATE (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } - yyn += yychar1; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) goto yydefault; - yyn = yytable[yyn]; - - /* yyn is what to do for this token type in this state. - Negative => reduce, -yyn is rule number. - Positive => shift, yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (yyn < 0) + if (yyn <= 0) { - if (yyn == YYFLAG) + if (yyn == 0 || yyn == YYTABLE_NINF) goto yyerrlab; yyn = -yyn; goto yyreduce; } - else if (yyn == 0) - goto yyerrlab; - - if (yyn == YYFINAL) - YYACCEPT; - - /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %d (%s), ", - yychar, yytname[yychar1])); - - /* Discard the token being shifted unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - *++yyvsp = yylval; -#if YYLSP_NEEDED - *++yylsp = yylloc; -#endif /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; + /* Shift the lookahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + + /* Discard the shifted token. */ + yychar = YYEMPTY; + yystate = yyn; + *++yyvsp = yylval; + goto yynewstate; @@ -971,140 +1456,129 @@ yyreduce: /* If YYLEN is nonzero, implement the default value of the action: `$$ = $1'. - Otherwise, the following line sets YYVAL to the semantic value of - the lookahead token. This behavior is undocumented and Bison + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison users should not rely upon it. Assigning to YYVAL unconditionally makes the parser a bit smaller, and it avoids a GCC warning that YYVAL may be used uninitialized. */ yyval = yyvsp[1-yylen]; -#if YYLSP_NEEDED - /* Similarly for the default location. Let the user run additional - commands if for instance locations are ranges. */ - yyloc = yylsp[1-yylen]; - YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); -#endif -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables which - are defined only if `YYDEBUG' is set. */ - if (yydebug) + YY_REDUCE_PRINT (yyn); + switch (yyn) { - int yyi; - - YYFPRINTF (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); - - /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++) - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); - YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } -#endif - - switch (yyn) { - -case 1: -#line 153 "plural.y" -{ - if (yyvsp[0].exp == NULL) + case 2: +/* Line 1269 of yacc.c. */ +#line 155 "plural.y" + { + if ((yyvsp[(1) - (1)].exp) == NULL) YYABORT; - ((struct parse_args *) arg)->res = yyvsp[0].exp; + ((struct parse_args *) arg)->res = (yyvsp[(1) - (1)].exp); } break; -case 2: -#line 161 "plural.y" -{ - yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); + + case 3: +/* Line 1269 of yacc.c. */ +#line 163 "plural.y" + { + (yyval.exp) = new_exp_3 (qmop, (yyvsp[(1) - (5)].exp), (yyvsp[(3) - (5)].exp), (yyvsp[(5) - (5)].exp)); } break; -case 3: -#line 165 "plural.y" -{ - yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); + + case 4: +/* Line 1269 of yacc.c. */ +#line 167 "plural.y" + { + (yyval.exp) = new_exp_2 (lor, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 4: -#line 169 "plural.y" -{ - yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); + + case 5: +/* Line 1269 of yacc.c. */ +#line 171 "plural.y" + { + (yyval.exp) = new_exp_2 (land, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 5: -#line 173 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + + case 6: +/* Line 1269 of yacc.c. */ +#line 175 "plural.y" + { + (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 6: -#line 177 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + + case 7: +/* Line 1269 of yacc.c. */ +#line 179 "plural.y" + { + (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 7: -#line 181 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + + case 8: +/* Line 1269 of yacc.c. */ +#line 183 "plural.y" + { + (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 8: -#line 185 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + + case 9: +/* Line 1269 of yacc.c. */ +#line 187 "plural.y" + { + (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 9: -#line 189 "plural.y" -{ - yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); + + case 10: +/* Line 1269 of yacc.c. */ +#line 191 "plural.y" + { + (yyval.exp) = new_exp_1 (lnot, (yyvsp[(2) - (2)].exp)); } break; -case 10: -#line 193 "plural.y" -{ - yyval.exp = new_exp_0 (var); + + case 11: +/* Line 1269 of yacc.c. */ +#line 195 "plural.y" + { + (yyval.exp) = new_exp_0 (var); } break; -case 11: -#line 197 "plural.y" -{ - if ((yyval.exp = new_exp_0 (num)) != NULL) - yyval.exp->val.num = yyvsp[0].num; + + case 12: +/* Line 1269 of yacc.c. */ +#line 199 "plural.y" + { + if (((yyval.exp) = new_exp_0 (num)) != NULL) + (yyval.exp)->val.num = (yyvsp[(1) - (1)].num); } break; -case 12: -#line 202 "plural.y" -{ - yyval.exp = yyvsp[-1].exp; + + case 13: +/* Line 1269 of yacc.c. */ +#line 204 "plural.y" + { + (yyval.exp) = (yyvsp[(2) - (3)].exp); } break; -} - -#line 705 "bison.simple" - - yyvsp -= yylen; - yyssp -= yylen; -#if YYLSP_NEEDED - yylsp -= yylen; -#endif -#if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); +/* Line 1269 of yacc.c. */ +#line 1572 "plural.c" + default: break; } -#endif + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; -#if YYLSP_NEEDED - *++yylsp = yyloc; -#endif + /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule @@ -1112,11 +1586,11 @@ case 12: yyn = yyr1[yyn]; - yystate = yypgoto[yyn - YYNTBASE] + *yyssp; - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) yystate = yytable[yystate]; else - yystate = yydefgoto[yyn - YYNTBASE]; + yystate = yydefgoto[yyn - YYNTOKENS]; goto yynewstate; @@ -1129,155 +1603,126 @@ yyerrlab: if (!yyerrstatus) { ++yynerrs; - -#ifdef YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (yyn > YYFLAG && yyn < YYLAST) - { - YYSIZE_T yysize = 0; - char *yymsg; - int yyx, yycount; - - yycount = 0; - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) - if (yycheck[yyx + yyn] == yyx) - yysize += yystrlen (yytname[yyx]) + 15, yycount++; - yysize += yystrlen ("parse error, unexpected ") + 1; - yysize += yystrlen (yytname[YYTRANSLATE (yychar)]); - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) - { - char *yyp = yystpcpy (yymsg, "parse error, unexpected "); - yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]); - - if (yycount < 5) - { - yycount = 0; - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); - yyx++) - if (yycheck[yyx + yyn] == yyx) - { - const char *yyq = ! yycount ? ", expecting " : " or "; - yyp = yystpcpy (yyp, yyq); - yyp = yystpcpy (yyp, yytname[yyx]); - yycount++; - } - } - yyerror (yymsg); +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); - } - else - yyerror ("parse error; also virtual memory exhausted"); - } - else -#endif /* defined (YYERROR_VERBOSE) */ - yyerror ("parse error"); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (yymsg); + } + else + { + yyerror (YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } + } +#endif } - goto yyerrlab1; -/*--------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action | -`--------------------------------------------------*/ -yyerrlab1: + if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ - /* return failure if at end of input */ - if (yychar == YYEOF) - YYABORT; - YYDPRINTF ((stderr, "Discarding token %d (%s).\n", - yychar, yytname[yychar1])); - yychar = YYEMPTY; + if (yychar <= YYEOF) + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } + else + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error token. */ + goto yyerrlab1; - yyerrstatus = 3; /* Each real token shifted decrements this */ - - goto yyerrhandle; +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: -/*-------------------------------------------------------------------. -| yyerrdefault -- current state does not do anything special for the | -| error token. | -`-------------------------------------------------------------------*/ -yyerrdefault: -#if 0 - /* This is wrong; only states that explicitly want error tokens - should shift them. */ + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) + goto yyerrorlab; - /* If its default is to accept any token, ok. Otherwise pop it. */ - yyn = yydefact[yystate]; - if (yyn) - goto yydefault; -#endif + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + yystate = *yyssp; + goto yyerrlab1; -/*---------------------------------------------------------------. -| yyerrpop -- pop the current state because it cannot handle the | -| error token | -`---------------------------------------------------------------*/ -yyerrpop: - if (yyssp == yyss) - YYABORT; - yyvsp--; - yystate = *--yyssp; -#if YYLSP_NEEDED - yylsp--; -#endif +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ -#if YYDEBUG - if (yydebug) + for (;;) { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "Error: state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } -#endif + yyn = yypact[yystate]; + if (yyn != YYPACT_NINF) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } -/*--------------. -| yyerrhandle. | -`--------------*/ -yyerrhandle: - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yyerrdefault; + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; - yyn += YYTERROR; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) - goto yyerrdefault; - yyn = yytable[yyn]; - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrpop; - yyn = -yyn; - goto yyreduce; + yydestruct ("Error: popping", + yystos[yystate], yyvsp); + YYPOPSTACK (1); + yystate = *yyssp; + YY_STACK_PRINT (yyss, yyssp); } - else if (yyn == 0) - goto yyerrpop; - if (yyn == YYFINAL) - YYACCEPT; + *++yyvsp = yylval; - YYDPRINTF ((stderr, "Shifting error token, ")); - *++yyvsp = yylval; -#if YYLSP_NEEDED - *++yylsp = yylloc; -#endif + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1297,22 +1742,45 @@ yyabortlab: yyresult = 1; goto yyreturn; -/*---------------------------------------------. -| yyoverflowab -- parser overflow comes here. | -`---------------------------------------------*/ -yyoverflowlab: - yyerror ("parser stack overflow"); +#ifndef yyoverflow +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); yyresult = 2; /* Fall through. */ +#endif yyreturn: + if (yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp); + YYPOPSTACK (1); + } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif - return yyresult; +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); } -#line 207 "plural.y" + + +/* Line 1486 of yacc.c. */ +#line 209 "plural.y" void @@ -1490,3 +1958,4 @@ yyerror (const char *str) { /* Do nothing. We don't print error messages here. */ } + diff --git a/gettext-runtime/libasprintf/autosprintf.info b/gettext-runtime/libasprintf/autosprintf.info index 9236df59a..1bfb4487f 100644 --- a/gettext-runtime/libasprintf/autosprintf.info +++ b/gettext-runtime/libasprintf/autosprintf.info @@ -1,4 +1,4 @@ -This is autosprintf.info, produced by makeinfo version 4.8 from +This is autosprintf.info, produced by makeinfo version 4.9 from autosprintf.texi. INFO-DIR-SECTION C++ libraries @@ -8,7 +8,7 @@ END-INFO-DIR-ENTRY This file provides documentation for GNU `autosprintf' library. - Copyright (C) 2002-2003 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2006-2007 Free Software Foundation, Inc. This manual is free documentation. It is dually licensed under the GNU FDL and the GNU GPL. This means that you can redistribute this @@ -92,7 +92,10 @@ heap. format string and additional arguments, like the C function `printf'. Conversions to `char *' and `std::string' are defined that return -the encapsulated string. +the encapsulated string. The conversion to `char *' returns a freshly +allocated copy of the encapsulated string; it needs to be freed using +`delete[]'. The conversion to `std::string' returns a copy of the +encapsulated string, with automatic memory management. The destructor `~autosprintf ()' destroys the encapsulated string. @@ -123,9 +126,9 @@ variable that it provides.  Tag Table: -Node: Top1336 -Node: Introduction1696 -Node: Class autosprintf2847 -Node: Using autosprintf3619 +Node: Top1347 +Node: Introduction1707 +Node: Class autosprintf2858 +Node: Using autosprintf3868  End Tag Table diff --git a/gettext-runtime/libasprintf/autosprintf_all.html b/gettext-runtime/libasprintf/autosprintf_all.html index 670e067d0..725b3eae4 100644 --- a/gettext-runtime/libasprintf/autosprintf_all.html +++ b/gettext-runtime/libasprintf/autosprintf_all.html @@ -1,7 +1,7 @@ + from autosprintf.texi on 1 September 2007 --> GNU autosprintf @@ -20,6 +20,36 @@

+

+Copyright (C) 2002-2003, 2006-2007 Free Software Foundation, Inc. + +

+

+This manual is free documentation. It is dually licensed under the +GNU FDL and the GNU GPL. This means that you can redistribute this +manual under either of these two licenses, at your choice. + +

+

+This manual is covered by the GNU FDL. Permission is granted to copy, +distribute and/or modify this document under the terms of the +GNU Free Documentation License (FDL), either version 1.2 of the +License, or (at your option) any later version published by the +Free Software Foundation (FSF); with no Invariant Sections, with no +Front-Cover Text, and with no Back-Cover Texts. +A copy of the license is at http://www.gnu.org/licenses/fdl.html. + +

+

+This manual is covered by the GNU GPL. You can redistribute it and/or +modify it under the terms of the GNU General Public License (GPL), either +version 2 of the License, or (at your option) any later version published +by the Free Software Foundation (FSF). +A copy of the license is at http://www.gnu.org/licenses/gpl.html. + +

+ +

1 Introduction

@@ -92,7 +122,10 @@ string and additional arguments, like the C function printf.

Conversions to char * and std::string are defined that return -the encapsulated string. +the encapsulated string. The conversion to char * returns a freshly +allocated copy of the encapsulated string; it needs to be freed using +delete[]. The conversion to std::string returns a copy of +the encapsulated string, with automatic memory management.

@@ -134,7 +167,7 @@ it provides.

-This document was generated on 22 August 2006 using the +This document was generated on 1 September 2007 using the texi2html translator version 1.52b.

diff --git a/gettext-runtime/man/bind_textdomain_codeset.3 b/gettext-runtime/man/bind_textdomain_codeset.3 index f894807c0..c4435ef1d 100644 --- a/gettext-runtime/man/bind_textdomain_codeset.3 +++ b/gettext-runtime/man/bind_textdomain_codeset.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.16" +.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.17" .SH NAME bind_textdomain_codeset \- set encoding of message translations .SH SYNOPSIS diff --git a/gettext-runtime/man/bindtextdomain.3 b/gettext-runtime/man/bindtextdomain.3 index afd3fe1e5..105f4777a 100644 --- a/gettext-runtime/man/bindtextdomain.3 +++ b/gettext-runtime/man/bindtextdomain.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.16" +.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.17" .SH NAME bindtextdomain \- set directory containing message catalogs .SH SYNOPSIS diff --git a/gettext-runtime/man/envsubst.1 b/gettext-runtime/man/envsubst.1 index 295d06124..0c76b9d6c 100644 --- a/gettext-runtime/man/envsubst.1 +++ b/gettext-runtime/man/envsubst.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH ENVSUBST "1" "October 2006" "GNU gettext-runtime 0.16" GNU +.TH ENVSUBST "1" "November 2007" "GNU gettext-runtime 0.17" GNU .SH NAME envsubst \- substitutes environment variables in shell format strings .SH SYNOPSIS @@ -35,10 +35,11 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2003-2006 Free Software Foundation, Inc. +Copyright \(co 2003-2007 Free Software Foundation, Inc. +License GPLv3+: GNU GPL version 3 or later .br -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. .SH "SEE ALSO" The full documentation for .B envsubst diff --git a/gettext-runtime/man/envsubst.1.html b/gettext-runtime/man/envsubst.1.html index efb093343..7ad2c3734 100644 --- a/gettext-runtime/man/envsubst.1.html +++ b/gettext-runtime/man/envsubst.1.html @@ -134,11 +134,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2003-2006 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. +Copyright 2003-2007 Free Software Foundation, Inc. License +GPLv3+: GNU GPL version 3 or later +<http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and +redistribute it. There is NO WARRANTY, to the extent +permitted by law.

SEE ALSO

diff --git a/gettext-runtime/man/gettext.1.html.in b/gettext-runtime/man/gettext.1.html.in index 0bc6bfdd5..910c77027 100644 --- a/gettext-runtime/man/gettext.1.html.in +++ b/gettext-runtime/man/gettext.1.html.in @@ -174,12 +174,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1997, 2000-2006 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. +Copyright 1995-1997, 2000-2007 Free Software Foundation, +Inc. License GPLv3+: GNU GPL version 3 or later +<http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and +redistribute it. There is NO WARRANTY, to the extent +permitted by law.

SEE ALSO

diff --git a/gettext-runtime/man/gettext.1.in b/gettext-runtime/man/gettext.1.in index d11d41b14..03a2b10e2 100644 --- a/gettext-runtime/man/gettext.1.in +++ b/gettext-runtime/man/gettext.1.in @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH GETTEXT "1" "October 2006" "GNU gettext-runtime 0.16" GNU +.TH GETTEXT "1" "November 2007" "GNU gettext-runtime 0.17" GNU .SH NAME gettext \- translate message .SH SYNOPSIS @@ -50,10 +50,11 @@ Written by Ulrich Drepper. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1997, 2000-2006 Free Software Foundation, Inc. +Copyright \(co 1995-1997, 2000-2007 Free Software Foundation, Inc. +License GPLv3+: GNU GPL version 3 or later .br -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. .SH "SEE ALSO" The full documentation for .B gettext diff --git a/gettext-runtime/man/gettext.3 b/gettext-runtime/man/gettext.3 index 9492d1458..3753e86c6 100644 --- a/gettext-runtime/man/gettext.3 +++ b/gettext-runtime/man/gettext.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH GETTEXT 3 "May 2001" "GNU gettext 0.16" +.TH GETTEXT 3 "May 2001" "GNU gettext 0.17" .SH NAME gettext, dgettext, dcgettext \- translate message .SH SYNOPSIS diff --git a/gettext-runtime/man/ngettext.1.html.in b/gettext-runtime/man/ngettext.1.html.in index 3edf72723..b41f03247 100644 --- a/gettext-runtime/man/ngettext.1.html.in +++ b/gettext-runtime/man/ngettext.1.html.in @@ -184,12 +184,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1997, 2000-2006 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. +Copyright 1995-1997, 2000-2007 Free Software Foundation, +Inc. License GPLv3+: GNU GPL version 3 or later +<http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and +redistribute it. There is NO WARRANTY, to the extent +permitted by law.

SEE ALSO

diff --git a/gettext-runtime/man/ngettext.1.in b/gettext-runtime/man/ngettext.1.in index 7968158e1..9fa687365 100644 --- a/gettext-runtime/man/ngettext.1.in +++ b/gettext-runtime/man/ngettext.1.in @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH NGETTEXT "1" "October 2006" "GNU gettext-runtime 0.16" GNU +.TH NGETTEXT "1" "November 2007" "GNU gettext-runtime 0.17" GNU .SH NAME ngettext \- translate message and choose plural form .SH SYNOPSIS @@ -49,10 +49,11 @@ Written by Ulrich Drepper. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1997, 2000-2006 Free Software Foundation, Inc. +Copyright \(co 1995-1997, 2000-2007 Free Software Foundation, Inc. +License GPLv3+: GNU GPL version 3 or later .br -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. .SH "SEE ALSO" The full documentation for .B ngettext diff --git a/gettext-runtime/man/ngettext.3 b/gettext-runtime/man/ngettext.3 index 7515cc747..981fcad9f 100644 --- a/gettext-runtime/man/ngettext.3 +++ b/gettext-runtime/man/ngettext.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH NGETTEXT 3 "May 2001" "GNU gettext 0.16" +.TH NGETTEXT 3 "May 2001" "GNU gettext 0.17" .SH NAME ngettext, dngettext, dcngettext \- translate message and choose plural form .SH SYNOPSIS diff --git a/gettext-runtime/man/textdomain.3 b/gettext-runtime/man/textdomain.3 index 6d5b48fa7..f7e6b0caa 100644 --- a/gettext-runtime/man/textdomain.3 +++ b/gettext-runtime/man/textdomain.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.16" +.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.17" .SH NAME textdomain \- set domain for future gettext() calls .SH SYNOPSIS diff --git a/gettext-runtime/po/be.po b/gettext-runtime/po/be.po index 97b373b08..e1a2277ab 100644 --- a/gettext-runtime/po/be.po +++ b/gettext-runtime/po/be.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2002-09-04 18:51+0300\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "" @@ -24,136 +24,133 @@ msgstr "" msgid "Unknown system error" msgstr "Невядомая сістэмная памылка" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: выбар `%s' неадназначны\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: выбар `%s' патрабуе аргумэнт\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: нераспазнаны выбар `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: нераспазнаны выбар `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: несапраўдны выбар -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: нерэчаісны выбар -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: выбар патрабуе аргумэнт -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: выбар `-W %s' неадназначны\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "памяць вычарпана" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n" -"пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n" -"магчымасьці выкарыстньня зь якой небудзь мэтай.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Аўтар %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "вельмі шмат аргумэнтаў" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "прапушчаны аргумэнты" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, fuzzy, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, fuzzy, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" @@ -161,7 +158,7 @@ msgstr "" " -h, --help адлюстроўвае дапамогу й выходзіць\n" " -V, --version выводзіць зьвесткі аб версіі й выходзіць\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -172,32 +169,36 @@ msgid "" "standard input are substituted.\n" msgstr "" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" msgstr "" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "Паведамляйце аб памылках на адрас .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "памылка ў час чытаньня \"%s\"" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "стандартны ўвод" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -206,12 +207,12 @@ msgstr "" "Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n" " ці: %s [ВЫБАР] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -232,7 +233,7 @@ msgstr "" " [TEXTDOMAIN] MSGID вяртае перакладзеныя паведамленьні суадносна\n" " MSGID з TEXTDOMAIN\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -253,12 +254,12 @@ msgstr "" "замест існуючых паведамленьняў знаходзіць у азначаным каталёгу перакладзеныя.\n" "Стандартная дырэкторыя для пошуку: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -267,7 +268,7 @@ msgstr "" "Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n" "граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -288,7 +289,7 @@ msgstr "" " [TEXTDOMAIN] MSGID вяртае перакладзеныя паведамленьні суадносна\n" " MSGID з TEXTDOMAIN\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -303,6 +304,18 @@ msgstr "" "асяроддзя TEXTDOMAINDIR.\n" "Стандартная дырэкторыя для пошуку: %s\n" +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n" +#~ "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n" +#~ "магчымасьці выкарыстньня зь якой небудзь мэтай.\n" + #~ msgid "invalid argument `%s' for `%s'" #~ msgstr "нерэчаісны аргумэнт `%s' для `%s'" diff --git a/gettext-runtime/po/ca.po b/gettext-runtime/po/ca.po index 3d0b1d4bf..df6c4618e 100644 --- a/gettext-runtime/po/ca.po +++ b/gettext-runtime/po/ca.po @@ -50,7 +50,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-27 15:20+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-28 18:06+0100\n" "Last-Translator: Ivan Vilata i Balaguer \n" "Language-Team: Catalan \n" diff --git a/gettext-runtime/po/cs.po b/gettext-runtime/po/cs.po index 0c7baad08..f4b62d8b0 100644 --- a/gettext-runtime/po/cs.po +++ b/gettext-runtime/po/cs.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.38\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2001-08-18 15:22+0200\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" @@ -23,7 +23,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "" @@ -33,160 +33,155 @@ msgid "Unknown system error" msgstr "Neznámá systémová chyba" # lib/getopt.c:628 -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: pøepínaè `%s' není jednoznaèný\n" # lib/getopt.c:652 -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: pøepínaè `--%s' musí být zadán bez argumentu\n" # lib/getopt.c:657 -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: pøepínaè `%c%s' musí být zadán bez argumentu\n" # lib/getopt.c:674 lib/getopt.c:847 -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: pøepínaè `%s' vy¾aduje argument\n" # lib/getopt.c:703 -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: neznámý pøepínaè `--%s'\n" # lib/getopt.c:707 -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: neznámý pøepínaè `%c%s'\n" # lib/getopt.c:733 -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: neznámý pøepínaè -- %c\n" # lib/getopt.c:736 -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: neznámý pøepínaè -- %c\n" # lib/getopt.c:766 lib/getopt.c:896 -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: pøepínaè vy¾aduje argument -- %c\n" # lib/getopt.c:813 -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n" # lib/getopt.c:831 -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: pøepínaè ` -W %s' musí být zadán bez argumentu\n" # lib/xmalloc.c:82 -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "pamì» vyèerpána" -# src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251 -# src/msgunfmt.c:175 src/xgettext.c:394 -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -" Copyright (C) %s Free Software Foundation, Inc.\n" -" Toto je volné programové vybavení; podmínky pro kopírování a roz¹iøování\n" -"naleznete ve zdrojových textech. Toto programové vybavení je zcela BEZ ZÁRUKY,\n" -"a to i bez záruky PRODEJNOSTI nebo VHODNOSTI PRO NÌJAKÝ KONKRÉTNÍ ÚÈEL.\n" # src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256 # src/msgunfmt.c:180 src/xgettext.c:399 -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Autor: %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" # src/gettextp.c:164 -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "pøíli¹ mnoho argumentù" # src/gettextp.c:154 -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "chybí argumenty" # src/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298 # src/msgunfmt.c:210 src/xgettext.c:532 -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Více informací získáte pøíkazem `%s --help'.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -197,7 +192,7 @@ msgid "" "standard input are substituted.\n" msgstr "" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -206,7 +201,11 @@ msgstr "" # src/gettextp.c:255 src/msgcmp.c:200 src/msgfmt.c:386 src/msgmerge.c:331 # src/msgunfmt.c:234 src/xgettext.c:582 -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 #, fuzzy msgid "Report bugs to .\n" msgstr "" @@ -215,35 +214,35 @@ msgstr "" "anglicky), pøipomínky k pøekladu zasílejte na adresu (èesky).\n" # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254 -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "chyba pøi ètení \"%s\"" # src/xget-lex.c:150 -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "standardní vstup" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" # src/gettextp.c:233 -#: src/gettext.c:254 +#: src/gettext.c:253 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -266,7 +265,7 @@ msgstr "" " MSGID z TEXTOVÉDOMÉNY\n" # src/gettextp.c:245 -#: src/gettext.c:265 +#: src/gettext.c:264 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -289,12 +288,12 @@ msgstr "" "\n" " Standardní prohledávaný adresáø: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -302,7 +301,7 @@ msgid "" msgstr "" # src/gettextp.c:233 -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -328,7 +327,7 @@ msgstr "" " pøeklad\n" # src/gettextp.c:245 -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -344,6 +343,22 @@ msgstr "" "v promìnné prostøedí TEXTDOMAINDIR.\n" " Adresáø, ve kterém se hledá: %s\n" +# src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251 +# src/msgunfmt.c:175 src/xgettext.c:394 +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ " Copyright (C) %s Free Software Foundation, Inc.\n" +#~ " Toto je volné programové vybavení; podmínky pro kopírování a " +#~ "roz¹iøování\n" +#~ "naleznete ve zdrojových textech. Toto programové vybavení je zcela BEZ " +#~ "ZÁRUKY,\n" +#~ "a to i bez záruky PRODEJNOSTI nebo VHODNOSTI PRO NÌJAKÝ KONKRÉTNÍ ÚÈEL.\n" + # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174 # src/xget-lex.c:191 src/xgettext.c:616 #~ msgid "error while opening \"%s\" for reading" diff --git a/gettext-runtime/po/da.po b/gettext-runtime/po/da.po index 03b5f94bc..b70e4e856 100644 --- a/gettext-runtime/po/da.po +++ b/gettext-runtime/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2002-09-07 19:32+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "" @@ -26,136 +26,133 @@ msgstr "" msgid "Unknown system error" msgstr "Ukendt systemfejl" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: tilvalget '%s' kan betyde flere ting\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: tilvalget '--%s' tillader ikke et argument\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: tilvalget `%c%s' tillader ikke et argument\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: tilvalget `%s' kræver et argument\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ukendt tilvalg `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ukendt tilvalg `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ulovligt tilvalg -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ugyldigt tilvalg -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: tilvalget '%c' kræver et argument\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: tilvalget '-W %s' er flertydigt\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "ikke mere ledig hukommelse" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright © %s Free Software Foundation, Inc.\n" -"Dette er frit programmel; se kildekoden for kopieringsbetingelser. Der er\n" -"INGEN garanti; heller ikke for SALGBARHED eller EGNETHED FOR NOGET SÆRLIGT\n" -"FORMÅL.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Skrevet af %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "For mange argumenter" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "argumenter mangler" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv '%s --help' for yderligere oplysninger.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, fuzzy, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Brug: %s [TILVALG] [FIL]...\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, fuzzy, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" @@ -163,7 +160,7 @@ msgstr "" " -h, --help vis denne hjælp og afslut\n" " -V, --version vis versionsinformation og afslut\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -174,32 +171,36 @@ msgid "" "standard input are substituted.\n" msgstr "" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" msgstr "" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "Rapportér fejl på engelsk til .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "fejl ved læsning af '%s'" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "standard-inddata" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -208,12 +209,12 @@ msgstr "" "Brug: %s [TILVALG] [[TEKSTDOMÆNE] TEKSTID]\n" "eller: %s [TILVALG] -s [TEKSTID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Vis ikke-engelsk oversættelse af en tekstbesked.\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -233,7 +234,7 @@ msgstr "" " [TEKSTDOMÆNE] TEKSTID hent den oversatte tekst svarende til\n" " TEKSTID fra TEKSTDOMÆNE\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -254,12 +255,12 @@ msgstr "" "oversættes de tekster der findes i det valgte tekstkatalog.\n" "Standard-filkataloget for søgning er: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Brug: %s [TILVALG] [TEKSTDOMÆNE] TEKSTID TEKSTID-FLERTAL ANTAL\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -268,7 +269,7 @@ msgstr "" "Vis oversættelser i det lokale sprog af tekstbeskeder hvis grammatiske\n" "form beror på et tal.\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -289,7 +290,7 @@ msgstr "" " TEKSTID TEKSTID-FLERTAL oversæt TEKSTID (ental) / TEKSTID-FLERTAL (flertal)\n" " COUNT vælg ental/flertalsform ud fra denne værdi\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -304,6 +305,20 @@ msgstr "" "TEXTDOMAINDIR.\n" "Standard-filkataloget for søgning er: %s\n" +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright © %s Free Software Foundation, Inc.\n" +#~ "Dette er frit programmel; se kildekoden for kopieringsbetingelser. Der " +#~ "er\n" +#~ "INGEN garanti; heller ikke for SALGBARHED eller EGNETHED FOR NOGET " +#~ "SÆRLIGT\n" +#~ "FORMÅL.\n" + #~ msgid "invalid argument `%s' for `%s'" #~ msgstr "Ugyldigt argument '%s' for '%s'" diff --git a/gettext-runtime/po/de.po b/gettext-runtime/po/de.po index 4295717d9..841ca2bc7 100644 --- a/gettext-runtime/po/de.po +++ b/gettext-runtime/po/de.po @@ -76,7 +76,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.15-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2006-07-06 10:40+0200\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -85,7 +85,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "Fehler beim Schreiben" @@ -93,141 +93,138 @@ msgstr "Fehler beim Schreiben" msgid "Unknown system error" msgstr "Unbekannter Systemfehler" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: Option »%s« ist mehrdeutig\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: Option »--%s« erwartet kein Argument\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: Option »%c%s« erwartet kein Argument\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: Option »%s« erwartet ein Argument\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unbekannte Option »--%s«\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unbekannte Option »%c%s«\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: unzulässige Option -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ungültige Option -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: Option erwartet ein Argument -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: Option »-W %s« ist mehrdeutig\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: Option »-W %s« erwartet kein Argument\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "virtueller Speicher aufgebraucht" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright © %s Free Software Foundation, Inc.\n" -"Dies ist freie Software; in den Quellen befindet sich die Lizenzbedingung.\n" -"Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n" -"die VERWENDBARKEIT ZU EINEN ANGEGEBENEN ZWECK.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Geschrieben von %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "zu viele Argumente" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "Argumente fehlen" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "»%s --help« gibt weitere Informationen.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Aufruf: %s [OPTION] [SHELL-FORMAT]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "Werte der Umgebungsvariablen substituieren.\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "Art der Verarbeitung:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr " -v, --variables Variablen ausgeben, die im SHELL-FORMAT vorkommen\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Informative Ausgabe:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help diese Hilfe anzeigen und beenden\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version Versionsnummer anzeigen und beenden\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -244,7 +241,7 @@ msgstr "" "referenziert, substituiert; andernfalls werden alle Referenzen auf\n" "Umgebungsvariablen bei der Standardausgabe substituiert.\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -254,28 +251,32 @@ msgstr "" "Standardausgabe wird aus allen Umgebungsvariablen bestehen, die im\n" "SHELL-FORMAT referenziert sind, immer eine pro Zeile.\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "" "Fehler bitte auf Englisch an melden.\n" "\n" "Für die deutsche Übersetzung ist die Mailingliste zuständig.\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "Fehler beim Lesen von »%s«" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "Standardeingabe" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -285,12 +286,12 @@ msgstr "" "oder: %s [OPTION] -s [SCHLÜSSEL]...\n" # CHECKIT -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Übersetzung einer textuellen Meldung in einer nativen Sprache anzeigen.\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -311,7 +312,7 @@ msgstr "" " [TEXTBEREICH] SCHLÜSSEL die Übersetzung zu SCHLÜSSEL aus TEXTBEREICH\n" " anfordern\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -334,13 +335,13 @@ msgstr "" "\n" "Standardverzeichnis: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Aufruf: %s [OPTION] [TEXTBEREICH] SCHLÜSSEL SCHLÜSSEL-PLURAL ZAHL\n" # CHECKIT -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -349,7 +350,7 @@ msgstr "" "Übersetzung einer textuellen Meldung, deren grammatische Form von einer Zahl\n" "abhängt, in einer nativen Sprache anzeigen.\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -372,7 +373,7 @@ msgstr "" " ZAHL Singular-/Pluralform anhand des Wertes ZAHL\n" " wählen\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -387,3 +388,16 @@ msgstr "" "Umgebungsvariable TEXTDOMAINDIR ein anderes Verzeichnis angegeben werden.\n" "\n" "Standardverzeichnis: %s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright © %s Free Software Foundation, Inc.\n" +#~ "Dies ist freie Software; in den Quellen befindet sich die " +#~ "Lizenzbedingung.\n" +#~ "Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n" +#~ "die VERWENDBARKEIT ZU EINEN ANGEGEBENEN ZWECK.\n" diff --git a/gettext-runtime/po/el.po b/gettext-runtime/po/el.po index d35b97c76..f22108f51 100644 --- a/gettext-runtime/po/el.po +++ b/gettext-runtime/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.34\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 1998-05-17 13:12+0200\n" "Last-Translator: Simos KSenitellis \n" "Language-Team: Greek \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "" @@ -25,157 +25,153 @@ msgid "Unknown system error" msgstr "¶ãíùóôï óöÜëìá óõóôÞìáôïò" # -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n" # -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ç åðéëïãÞ `--%s' äåí åðéôñÝðåé ðáñÜìåôñï\n" # -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ç åðéëïãÞ `%c%s' äåí åðéôñÝðåé ðáñÜìåôñï\n" # -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß ðáñÜìåôñï\n" # -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `--%s'\n" # -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `%c%s'\n" # -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ìç áðïäåêôÞ åðéëïãÞ -- %c\n" # -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ìç Ýãêõñç åðéëïãÞ -- %c\n" # -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ç åðéëïãÞ áðáéôåß ðáñÜìåôñï -- %c\n" # -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé äéöïñïýìåíç\n" # -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé ðáñÜìåôñï\n" # -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, fuzzy, c-format msgid "memory exhausted" msgstr "H ìíÞìç åîáíôëÞèçêå" -# -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"ÐíåõìáôéêÜ Äéêáéþìáôá (C) %s Free Software Foundation, Inc.\n" -"Áõôü ôï ðñüãñáììá åßíáé åëåýèåñï ëïãéóìéêü· äåßôå ôï ðçãáßï êþäéêá ãéá ôïõò\n" -"êáíïíéóìïýò áíôéãñáöÞò. Äåí õðÜñ÷åé ÊÁÌÉÁ ÅÃÃÕÇÓÇ· ïýôå áêüìá ãéá\n" -"ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n" # -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" # -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "ðÜñá ðïëëÜ ïñßóìáôá" # -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "õðïëåßðïíôáé ïñßóìáôá" # -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -186,7 +182,7 @@ msgid "" "standard input are substituted.\n" msgstr "" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -194,41 +190,45 @@ msgid "" msgstr "" # -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 #, fuzzy msgid "Report bugs to .\n" msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï .\n" # -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\"" # -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "êáíïíéêÞ åßóïäïò" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" # -#: src/gettext.c:254 +#: src/gettext.c:253 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -252,7 +252,7 @@ msgstr "" " óôï MSGID áðü ôï TEXTDOMAIN\n" # -#: src/gettext.c:265 +#: src/gettext.c:264 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -273,12 +273,12 @@ msgstr "" "Áíôßèåôá, ôá ìçíýìáôá ðïõ âñßóêïíôáé óôï åðéëåãìÝíï êáôÜëïãï, ìåôáöñÜæïíôáé.\n" "ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -286,7 +286,7 @@ msgid "" msgstr "" # -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -310,7 +310,7 @@ msgstr "" " óôï MSGID áðü ôï TEXTDOMAIN\n" # -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -328,6 +328,20 @@ msgstr "" "Áíôßèåôá, ôá ìçíýìáôá ðïõ âñßóêïíôáé óôï åðéëåãìÝíï êáôÜëïãï, ìåôáöñÜæïíôáé.\n" "ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n" +# +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "ÐíåõìáôéêÜ Äéêáéþìáôá (C) %s Free Software Foundation, Inc.\n" +#~ "Áõôü ôï ðñüãñáììá åßíáé åëåýèåñï ëïãéóìéêü· äåßôå ôï ðçãáßï êþäéêá ãéá " +#~ "ôïõò\n" +#~ "êáíïíéóìïýò áíôéãñáöÞò. Äåí õðÜñ÷åé ÊÁÌÉÁ ÅÃÃÕÇÓÇ· ïýôå áêüìá ãéá\n" +#~ "ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n" + # #~ msgid "error while opening \"%s\" for reading" #~ msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç" diff --git a/gettext-runtime/po/en@boldquot.po b/gettext-runtime/po/en@boldquot.po index 95e4a0c39..aef3ecbe6 100644 --- a/gettext-runtime/po/en@boldquot.po +++ b/gettext-runtime/po/en@boldquot.po @@ -1,7 +1,7 @@ # English translations for GNU gettext-runtime package. -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2007 Free Software Foundation, Inc. # This file is distributed under the same license as the GNU gettext-runtime package. -# Automatically generated, 2006. +# Automatically generated, 2007. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -30,10 +30,10 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU gettext-runtime\n" +"Project-Id-Version: GNU gettext-runtime 0.17\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" -"PO-Revision-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" +"PO-Revision-Date: 2007-11-02 03:22+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "write error" @@ -49,140 +49,142 @@ msgstr "write error" msgid "Unknown system error" msgstr "Unknown system error" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn't allow an argument\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: option ‘%c%s’ doesn't allow an argument\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: option ‘%s’ requires an argument\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unrecognized option ‘--%s’\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unrecognized option ‘%c%s’\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: illegal option -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: invalid option -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: option requires an argument -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: option ‘-W %s’ doesn't allow an argument\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "memory exhausted" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Written by %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "too many arguments" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "missing arguments" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try ‘%s --help’ for more information.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Usage: %s [OPTION] [SHELL-FORMAT]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "Substitutes the values of environment variables.\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "Operation mode:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr " -v, --variables output the variables occurring in SHELL-FORMAT\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Informative output:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help display this help and exit\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version output version information and exit\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -199,7 +201,7 @@ msgstr "" "substituted; otherwise all environment variables references occurring in\n" "standard input are substituted.\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -208,25 +210,29 @@ msgstr "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "Report bugs to .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "error while reading “%s”" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "standard input" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -235,12 +241,12 @@ msgstr "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Display native language translation of a textual message.\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -261,7 +267,7 @@ msgstr "" " [TEXTDOMAIN] MSGID retrieve translated message corresponding\n" " to MSGID from TEXTDOMAIN\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -282,12 +288,12 @@ msgstr "" "found in the selected catalog are translated.\n" "Standard search directory: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -296,7 +302,7 @@ msgstr "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -317,7 +323,7 @@ msgstr "" " MSGID MSGID-PLURAL translate MSGID (singular) / MSGID-PLURAL (plural)\n" " COUNT choose singular/plural form based on this value\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" diff --git a/gettext-runtime/po/en@quot.po b/gettext-runtime/po/en@quot.po index 5311bcd22..a37d3c71c 100644 --- a/gettext-runtime/po/en@quot.po +++ b/gettext-runtime/po/en@quot.po @@ -1,7 +1,7 @@ # English translations for GNU gettext-runtime package. -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2007 Free Software Foundation, Inc. # This file is distributed under the same license as the GNU gettext-runtime package. -# Automatically generated, 2006. +# Automatically generated, 2007. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU gettext-runtime\n" +"Project-Id-Version: GNU gettext-runtime 0.17\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" -"PO-Revision-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" +"PO-Revision-Date: 2007-11-02 03:22+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "write error" @@ -46,140 +46,142 @@ msgstr "write error" msgid "Unknown system error" msgstr "Unknown system error" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn't allow an argument\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: option ‘%c%s’ doesn't allow an argument\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: option ‘%s’ requires an argument\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unrecognized option ‘--%s’\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unrecognized option ‘%c%s’\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: illegal option -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: invalid option -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: option requires an argument -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: option ‘-W %s’ doesn't allow an argument\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "memory exhausted" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Written by %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "too many arguments" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "missing arguments" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try ‘%s --help’ for more information.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Usage: %s [OPTION] [SHELL-FORMAT]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "Substitutes the values of environment variables.\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "Operation mode:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr " -v, --variables output the variables occurring in SHELL-FORMAT\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Informative output:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help display this help and exit\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version output version information and exit\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -196,7 +198,7 @@ msgstr "" "substituted; otherwise all environment variables references occurring in\n" "standard input are substituted.\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -205,25 +207,29 @@ msgstr "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "Report bugs to .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "error while reading “%s”" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "standard input" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -232,12 +238,12 @@ msgstr "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Display native language translation of a textual message.\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -258,7 +264,7 @@ msgstr "" " [TEXTDOMAIN] MSGID retrieve translated message corresponding\n" " to MSGID from TEXTDOMAIN\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -279,12 +285,12 @@ msgstr "" "found in the selected catalog are translated.\n" "Standard search directory: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -293,7 +299,7 @@ msgstr "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -314,7 +320,7 @@ msgstr "" " MSGID MSGID-PLURAL translate MSGID (singular) / MSGID-PLURAL (plural)\n" " COUNT choose singular/plural form based on this value\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" diff --git a/gettext-runtime/po/eo.po b/gettext-runtime/po/eo.po index 802663165..b41fa634f 100644 --- a/gettext-runtime/po/eo.po +++ b/gettext-runtime/po/eo.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-18 02:56+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-16 10:18+0100\n" "Last-Translator: D. Dale Gulledge \n" "Language-Team: Esperanto \n" diff --git a/gettext-runtime/po/es.po b/gettext-runtime/po/es.po index e327013b8..dfedce97b 100644 --- a/gettext-runtime/po/es.po +++ b/gettext-runtime/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext-runtime 0.14.5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2005-06-22 19:36-0600\n" "Last-Translator: Max de Mendizábal \n" "Language-Team: Spanish \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "error de escritura" @@ -25,145 +25,142 @@ msgstr "error de escritura" msgid "Unknown system error" msgstr "Hay un error del sistema desconocido" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: la opción `%s' es ambigua\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: la opción `--%s' no admite ningún argumento\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: la opción `%c%s' no admite ningún argumento\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: la opción `%s' requiere un argumento\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opción no reconocida `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opción no reconocida `%c%s'\n" # acepto la sugerencia de em en cuanto a que inválida parece cárcel # o inútil pero mejor puse inválida -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opción inválida -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opción inválida -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: la opción requiere un argumento -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: la opción `-W %s' es ambigua\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: la opción `-W %s' no admite ningún argumento\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "Memoria agotada" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"Esto es software libre; vea el código fuente para las condiciones de copia.\n" -"No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n" -"FIN DETERMINADO.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "demasiados argumentos" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "faltan argumentos" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pruebe `%s --help' para más información.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Modo de empleo: %s [OPCIÓN] [FORMATO-DEL-INTÉRPRETE-DE-COMANDOS]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "Sustituye los valores de las variables de entorno.\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "Modo de operación:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" " -v, --variables muestra las variables que aparecen en el \n" " FORMATO-DE-INTÉRPRETE-DE-COMANDOS\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Salida informativa:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help muestra este texto de ayuda y finaliza\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version muestra la versión y finaliza\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -182,7 +179,7 @@ msgstr "" "todas las referencias a las variables de entorno existentes en la\n" "entrada estándar, son sustituidas.\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -192,25 +189,29 @@ msgstr "" "contiene las variables de entorno que referidas en el FORMATO-DEL-\n" "INTÉRPRETE-DE-COMANDOS, una por línea.\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "Comunicar los `bugs' a .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "error mientras se lee \"%s\"" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "entrada estándar" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -219,7 +220,7 @@ msgstr "" "Modo de empleo: %s [OPCIÓN] [[DOMINIOTEXTO] MSGID]\n" " o: %s [OPCIÓN] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Mostrar la traducción a idioma nativo de un mensaje textual.\n" @@ -237,7 +238,7 @@ msgstr "Mostrar la traducci # Prefiero que se quede como está, pues aunque se repite muestra, # es en otra opción en donde aparece. mm # -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -261,7 +262,7 @@ msgstr "" # Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto # no se pueden traducir (cuando se refieren a las variables, claro está). -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -283,12 +284,12 @@ msgstr "" "encuentre dentro del catálogo seleccionado.\n" "Directorio de búsqueda estándar: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Modo de empleo: %s [OPCIÓN] [DOMINIODETEXTO] MSGID MSG-PLURAL CUENTA\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -310,7 +311,7 @@ msgstr "" # Prefiero que se quede como está, pues aunque se repite muestra, # es en otra opción en donde aparece. mm # -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -335,7 +336,7 @@ msgstr "" # Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto # no se pueden traducir (cuando se refieren a las variables, claro está). -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -349,3 +350,17 @@ msgstr "" "el directorio por defecto, con la variable de entorno TEXTDOMAINDIR se\n" "puede especificar otro lugar.\n" "Directorio de búsqueda estándar: %s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "Esto es software libre; vea el código fuente para las condiciones de " +#~ "copia.\n" +#~ "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA " +#~ "UN\n" +#~ "FIN DETERMINADO.\n" diff --git a/gettext-runtime/po/et.po b/gettext-runtime/po/et.po index e543f98ec..907778709 100644 --- a/gettext-runtime/po/et.po +++ b/gettext-runtime/po/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.37\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2001-04-30 16:25+0200\n" "Last-Translator: Ivar Smolin \n" "Language-Team: Estonian \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "" @@ -22,142 +22,138 @@ msgstr "" msgid "Unknown system error" msgstr "Tundmatu süsteemne viga" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: võti `%s' on mitmetähenduslik\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: võtmel `--%s' ei tohi olla argumente\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: võtmel `%c%s' ei tohi olla argumente\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: võtme `%s' järel peab olema argument\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: tundmatu võti `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: tundmatu võti `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: lubamatu võti -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: vigane võti -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: võtme järel peab olema argument -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: võti `-W %s' on mitmetähenduslik\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: võtmel `-W %s' ei tohi olla argumente\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "mälu sai otsa" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA IGASUGUSE\n" -"GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDI GARANTIITA või SOBIVUSELE\n" -"TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku\n" -"Litsentsi.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Selle programmi on kirjutanud %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "liiga palju argumente" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "argumendid on puudu" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Täiendava info saamiseks proovi `%s --help'.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -168,45 +164,49 @@ msgid "" "standard input are substituted.\n" msgstr "" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" msgstr "" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 #, fuzzy msgid "Report bugs to .\n" msgstr "Vigadest teata aadressile .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "viga \"%s\" lugemisel" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "standardsisend" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:254 +#: src/gettext.c:253 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -231,7 +231,7 @@ msgstr "" " määratud piirkonnas ja omavad identifikaatorit\n" " STRID\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -254,19 +254,19 @@ msgstr "" "found in the selected catalog are translated.!!!\n" "Standardne otsinukataloog: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -292,7 +292,7 @@ msgstr "" " STRID STRID-MITMUS tõlgib STRID (ainsus) / STRID-MITMUS (mitmus)\n" " ARV valib ainsuse/mitmuse vormi sellele arvule\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -308,6 +308,20 @@ msgstr "" "lugeda keskkonnamuutujast TEXTDOMAINDIR.\n" "Standardne otsinukataloog: %s\n" +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA " +#~ "IGASUGUSE\n" +#~ "GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDI GARANTIITA või SOBIVUSELE\n" +#~ "TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku\n" +#~ "Litsentsi.\n" + #~ msgid "error while opening \"%s\" for reading" #~ msgstr "viga faili \"%s\" avamisel (lugemiseks)" diff --git a/gettext-runtime/po/fi.po b/gettext-runtime/po/fi.po index 99018f94b..4e593a19a 100644 --- a/gettext-runtime/po/fi.po +++ b/gettext-runtime/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-18 02:56+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-21 00:28+0300\n" "Last-Translator: Lauri Nurmi \n" "Language-Team: Finnish \n" diff --git a/gettext-runtime/po/fr.po b/gettext-runtime/po/fr.po index 4c55cb862..d99ec41f3 100644 --- a/gettext-runtime/po/fr.po +++ b/gettext-runtime/po/fr.po @@ -4,13 +4,13 @@ # Il a été le traducteur jusqu'en 2001. # Michel Robitaille , traducteur depuis/since 1996. # Christophe Combelles , 2006, 2007 -# -# +# +# msgid "" msgstr "" "Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-27 15:20+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-27 13:43+0200\n" "Last-Translator: Christophe Combelles \n" "Language-Team: French \n" diff --git a/gettext-runtime/po/ga.po b/gettext-runtime/po/ga.po index aec23d8b0..1ea31d1f2 100644 --- a/gettext-runtime/po/ga.po +++ b/gettext-runtime/po/ga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-18 02:56+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-14 12:15-0500\n" "Last-Translator: Kevin Patrick Scannell \n" "Language-Team: Irish \n" diff --git a/gettext-runtime/po/gettext-runtime.pot b/gettext-runtime/po/gettext-runtime.pot index c05f4692b..20e1cc742 100644 --- a/gettext-runtime/po/gettext-runtime.pot +++ b/gettext-runtime/po/gettext-runtime.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: GNU gettext-runtime 0.17\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "" @@ -24,137 +24,138 @@ msgstr "" msgid "Unknown system error" msgstr "" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -165,44 +166,48 @@ msgid "" "standard input are substituted.\n" msgstr "" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" msgstr "" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -215,7 +220,7 @@ msgid "" " to MSGID from TEXTDOMAIN\n" msgstr "" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -228,19 +233,19 @@ msgid "" "Standard search directory: %s\n" msgstr "" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -253,7 +258,7 @@ msgid "" " COUNT choose singular/plural form based on this value\n" msgstr "" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" diff --git a/gettext-runtime/po/gl.po b/gettext-runtime/po/gl.po index 4b98a7ebf..49a40a1bd 100644 --- a/gettext-runtime/po/gl.po +++ b/gettext-runtime/po/gl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.10.39\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2001-07-28 17:00+0200\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1)\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "" @@ -28,141 +28,138 @@ msgstr "" msgid "Unknown system error" msgstr "Erro de sistema descoñecido" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: a opción `%s' é ambigua\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: a opción `--%s' non permite ningún argumento\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: a opción `%c%s' non permite ningún argumento\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: a opción `%s' require un argumento\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opción `--%s' descoñecida\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opción `%c%s' descoñecida\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opción ilegal -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opción non válida -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: a opción require un argumento -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: a opción `-W %s' é ambigua\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: a opción `-W %s' non permite ningún argumento\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "memoria esgotada" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"Isto é software libre; vexa o código para as condicións de copia. NON hai\n" -"ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n" -"FIN DETERMINADO.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "demasiados argumentos" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "faltan argumentos" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Use `%s --help' para máis información.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -173,45 +170,49 @@ msgid "" "standard input are substituted.\n" msgstr "" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" msgstr "" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 #, fuzzy msgid "Report bugs to .\n" msgstr "Comunique os erros a .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "entrada estándar" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:254 +#: src/gettext.c:253 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -233,7 +234,7 @@ msgstr "" " [DOMINIO] MSGID obte-la mensaxe traducida correspondente a\n" " MSGID do DOMINIO\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -254,19 +255,19 @@ msgstr "" "que atopa no catálogo escollido.\n" "Directorio estándar de busca: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -288,7 +289,7 @@ msgstr "" " MSGID MSGID-PLURAL traducir MSGID (singular) / MSGID-PLURAL (plural)\n" " CONTADOR escoller a forma singular/plural segundo este valor\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -303,6 +304,19 @@ msgstr "" "pódese especificar outro mediante a variable TEXTDOMAINDIR.\n" "Directorio estándar de busca: %s\n" +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "Isto é software libre; vexa o código para as condicións de copia. NON " +#~ "hai\n" +#~ "ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n" +#~ "FIN DETERMINADO.\n" + #~ msgid "error while opening \"%s\" for reading" #~ msgstr "erro ao abrir \"%s\" para lectura" diff --git a/gettext-runtime/po/id.po b/gettext-runtime/po/id.po index 22577fbd0..f0e5a787d 100644 --- a/gettext-runtime/po/id.po +++ b/gettext-runtime/po/id.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime-0.15-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2006-09-27 20:10+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "kesalahan penulisan" @@ -25,141 +25,138 @@ msgstr "kesalahan penulisan" msgid "Unknown system error" msgstr "Kesalahan sistem tak dikenal" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: pilihan `%s' rancu\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: pilihan `--%s' tidak membolehkan argumen\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: pilihan `%c%s' tidak membolehkan argumen\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "pilihan %s: `%s' memerlukan sebuah argumen\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: pilihan tak dikenal `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: pilihan tak dikenal `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: pilihan ilegal -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: pilihan tidak valid -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: pilihan membutuhkan sebuah argumen -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: pilihan `-W %s' rancu\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: pilihan `-W %s' tidak membolehkan sebuah argumen\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "Memori habis" -# ) -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Hak Cipta (C) %s Free Software Foundation, Inc.\n" -"Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak ada\n" -"jaminan; bahkan untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Ditulis oleh %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "terlalu banyak argumen" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "Argumen hilang" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Coba `%s --help' untuk informasi lebih jauh.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Penggunaan: %s [OPTION] [SHELL-FORMAT]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "Gantilah nilai variabel lingkungan.\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "Mode operasi:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr " -v, --variables hasilkan variabel yang muncul dalam SHELL-FORMAT\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Output informatif:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help tampilkan bantuan ini dan keluar\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version informasi versi dan keluar\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -177,7 +174,7 @@ msgstr "" "; bila tidak semua variabel lingkungan yang diacu yang muncul dalam \n" "input standar akan diganti.\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -186,25 +183,29 @@ msgstr "" "Ketika digunakan --variables, input standar diabaikan, dan hasilnya\n" "terdiri dari variabel lingkungan yang direfer dalam SHELL FORMAT, satu perbaris.\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "Laporkan kesalahan ke .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "kesalahan ketika membaca \"%s\"" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "standard input" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -213,12 +214,12 @@ msgstr "" "Pemakaian: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "atau: %s [OPTION] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Tampilkan terjemahan bahasa asli pesan tekstual.\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -239,7 +240,7 @@ msgstr "" " [TEXTDOMAIN] MSGID mengambil pesan terjemahan yang sesuai\n" " untuk MSGID dari TEXTDOMAIN\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -260,12 +261,12 @@ msgstr "" "diterjemahkan.\n" "Direktori pencarian standar: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Pemakaian: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -274,7 +275,7 @@ msgstr "" "Tampilkan terjemahan bahasa asli pesan tekstual yang bentuk gramatikalnya\n" "tergantung pada suatu angka.\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -296,7 +297,7 @@ msgstr "" " MSGID MSGID-PLURAL terjemahkan MSGID (tunggal) / MSGID-PLURAL (plural)\n" " COUNT pilih bentuk tunggal/plural berdasarkan nilai ini\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -310,3 +311,16 @@ msgstr "" "direktori reguler, lokasi lain dapat dispesifikasikan dengan variabel \n" "lingkungan TEXTDOMAINDIR.\n" "Direktori pencarian standar: %s\n" + +# ) +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Hak Cipta (C) %s Free Software Foundation, Inc.\n" +#~ "Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak " +#~ "ada\n" +#~ "jaminan; bahkan untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n" diff --git a/gettext-runtime/po/it.po b/gettext-runtime/po/it.po index 8cfdcfea6..83792a28a 100644 --- a/gettext-runtime/po/it.po +++ b/gettext-runtime/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-27 15:20+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-30 17:39+0000\n" "Last-Translator: Marco Colombo \n" "Language-Team: Italian \n" diff --git a/gettext-runtime/po/ja.po b/gettext-runtime/po/ja.po index c3237f787..4b7cdee71 100644 --- a/gettext-runtime/po/ja.po +++ b/gettext-runtime/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-18 02:56+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-16 10:29+0900\n" "Last-Translator: Masahito Yamaga \n" "Language-Team: Japanese \n" diff --git a/gettext-runtime/po/ko.po b/gettext-runtime/po/ko.po index 7e5d60210..e9f88bba3 100644 --- a/gettext-runtime/po/ko.po +++ b/gettext-runtime/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext-runtime 0.15-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2006-07-02 00:43+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "¾²±â ¿À·ù" @@ -24,140 +24,138 @@ msgstr " msgid "Unknown system error" msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: `%s'Àº(´Â) ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: `--%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: `%s' ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: À߸øµÈ ¿É¼Ç -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ºÎÀûÀýÇÑ ¿É¼Ç -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ÀÌ ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: `-W %s'Àº(´Â) ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³µ½À´Ï´Ù" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"ÀÌ ÇÁ·Î±×·¥Àº ÀÚÀ¯ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù. º¹»ç Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ. »óÇ°¼º\n" -"À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "%sÀÌ(°¡) ¸¸µé¾ú½À´Ï´Ù.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "Àμö°¡ ³Ê¹« ¸¹À½" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "Àμö°¡ ºüÁ³À½" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] [<½©-Çü½Ä>]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "ȯ°æ º¯¼ö °ªÀ» ġȯÇÕ´Ï´Ù.\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "µ¿ÀÛ ¸ðµå:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr " -v, --variables <½©-Çü½Ä>¿¡ ³ª¿À´Â º¯¼ö¸¦ Ãâ·ÂÇÕ´Ï´Ù\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Á¤º¸ Ãâ·Â:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help ÀÌ µµ¿ò¸»À» Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -172,7 +170,7 @@ msgstr "" "<½©-Çü½Ä>À» ¾²¸é, <½©-Çü½Ä>¿¡¼­ »ç¿ëÇÑ È¯°æ º¯¼ö¸¸ ġȯÇÕ´Ï´Ù; <½©-Çü½Ä>À»\n" "¾²Áö ¾ÊÀ¸¸é Ç¥ÁØ ÀÔ·ÂÀÇ ¸ðµç ȯ°æ º¯¼ö¸¦ ġȯÇÕ´Ï´Ù.\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -181,25 +179,29 @@ msgstr "" "--variables ¿É¼ÇÀ» »ç¿ëÇϸé, Ç¥ÁØ ÀÔ·ÂÀ» ¹«½ÃÇÏ°í, <½©-Çü½Ä>¿¡ ÂüÁ¶µÈ ȯ°æ º¯¼ö¸¦\n" "ÇÑ ÁÙ¿¡ Çϳª¾¿ Ãâ·ÂÇÕ´Ï´Ù.\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "·Î ¹®Á¦Á¡À» ¾Ë·Á ÁֽʽÿÀ.\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "\"%s\"À»(¸¦) Àд µ¿¾È ¿À·ù ¹ß»ý" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "Ç¥ÁØ ÀÔ·Â" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -208,12 +210,12 @@ msgstr "" "»ç¿ë¹ý: %s [<¿É¼Ç>] [[] ]\n" "ȤÀº: %s [<¿É¼Ç>] -s []...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "ÁÖ¾îÁø ¸Þ¼¼Áö¿¡ ´ëÇÑ °íÀ¯¾î ¹ø¿ª¹®À» Ç¥½ÃÇÕ´Ï´Ù.\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -234,7 +236,7 @@ msgstr "" " [] ¿¡ ´ëÀÀÇÏ´Â ¹ø¿ªµÈ ¸Þ½ÃÁö¸¦ ¿¡¼­\n" " ºÒ·¯¿É´Ï´Ù\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -255,12 +257,12 @@ msgstr "" "¸ñ·Ï¿¡¼­ ¹ø¿ªµÇ¾î ÀÖ´Â ¸Þ½ÃÁö¸¸ÀÌ Ãâ·ÂµË´Ï´Ù.\n" "±âº» Ž»ö µð·ºÅ丮: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] [] <°³¼ö>\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -269,7 +271,7 @@ msgstr "" "¼ýÀÚ¿¡ µû¶ó ¹®¹ýÀÌ ´Þ¶óÁö´Â, ÁÖ¾îÁø ¸Þ¼¼Áö¿¡ ´ëÇÑ °íÀ¯¾î ¹ø¿ª¹®À»\n" "Ç¥½ÃÇÕ´Ï´Ù.\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -290,7 +292,7 @@ msgstr "" " MSGID MSGID-º¹¼öÇü MSGID(´Ü¼ö) / MSGID-º¹¼öÇü(º¹¼ö)À» ¹ø¿ªÇÕ´Ï´Ù\n" " °³¼ö ÀÌ °ª¿¡ µû¶ó ´Ü¼ö/º¹¼ö¸¦ °áÁ¤ÇÕ´Ï´Ù\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -304,3 +306,15 @@ msgstr "" "TEXTDOMAINDIR·Î ´Ù¸¥ À§Ä¡¸¦ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù.\n" "\n" "Ç¥ÁØ Å½»ö µð·ºÅ丮: %s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "ÀÌ ÇÁ·Î±×·¥Àº ÀÚÀ¯ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù. º¹»ç Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ. »ó" +#~ "Ç°¼º\n" +#~ "À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n" diff --git a/gettext-runtime/po/nb.po b/gettext-runtime/po/nb.po index 416d6b903..da2758d17 100644 --- a/gettext-runtime/po/nb.po +++ b/gettext-runtime/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.37\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-27 15:20+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2001-05-09 02:08+02:00\n" "Last-Translator: Trond Endrestøl \n" "Language-Team: Norwegian-bokmål \n" diff --git a/gettext-runtime/po/nl.po b/gettext-runtime/po/nl.po index 46b2a2c4b..80e2f1fab 100644 --- a/gettext-runtime/po/nl.po +++ b/gettext-runtime/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime-0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-18 02:56+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-16 18:51+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" diff --git a/gettext-runtime/po/nn.po b/gettext-runtime/po/nn.po index f3a8f6aed..5766cd77a 100644 --- a/gettext-runtime/po/nn.po +++ b/gettext-runtime/po/nn.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.12\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 1996-03-21 08:46 EST\n" "Last-Translator: Karl Anders Øygard \n" "Language-Team: Norwegian-nynorsk \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "" @@ -23,137 +23,138 @@ msgstr "" msgid "Unknown system error" msgstr "" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: flagg «%s» er fleirtydig\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: flagg «--%s» tek ikkje argument\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: flagg «%c%s» tek ikkje argument\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: flagg «%s» treng eit argument\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, fuzzy, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ulovleg flagg -- %c\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, fuzzy, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ulovleg flagg -- %c\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ulovleg flagg -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, fuzzy, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ulovleg flagg -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: flagg treng eit argument -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, fuzzy, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: flagg «%s» er fleirtydig\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, fuzzy, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: flagg «--%s» tek ikkje argument\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, fuzzy, c-format msgid "too many arguments" msgstr "manglar argument" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "manglar argument" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, fuzzy, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv «%s --help» for meir informasjon\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -164,44 +165,48 @@ msgid "" "standard input are substituted.\n" msgstr "" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" msgstr "" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, fuzzy, c-format msgid "error while reading \"%s\"" msgstr "feil under skriving av fila \"%s\"" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:254 +#: src/gettext.c:253 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -223,7 +228,7 @@ msgstr "" " [TEXTDOMAIN] MSGID hent oversett melding som stemmer overeins med\n" " MSGID frå TEXTDOMAIN\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -245,19 +250,19 @@ msgstr "" "staden vert meldingar som er funne i den valgte katalogen oversatt.\n" "Standard søkekatalog er: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -279,7 +284,7 @@ msgstr "" " [TEXTDOMAIN] MSGID hent oversett melding som stemmer overeins med\n" " MSGID frå TEXTDOMAIN\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -771,8 +776,7 @@ msgstr "" #~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " #~ "obsolete %ld.\n" #~ msgstr "" -#~ "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %" -#~ "d,\n" +#~ "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n" #~ "utdaterte %d.\n" #, fuzzy @@ -992,8 +996,7 @@ msgstr "" #~ " -u, --unique shorthand for --less-than=2, requests\n" #~ " that only unique messages be printed\n" #~ msgstr "" -#~ " -n, --add-location lag «#: filenavn:linje»-linjer " -#~ "(forvalgt)\n" +#~ " -n, --add-location lag «#: filenavn:linje»-linjer (forvalgt)\n" #~ " --omit-header ikkje lag startseksjon med «msgid \"\"»\n" #~ " -p, --output-dir=KAT plassér utfiler i filkatalogen KAT\n" #~ " -s, --sort-output sortér utdata og ta bort duplikat\n" @@ -1185,8 +1188,7 @@ msgstr "" #~ "\n" #~ "If INPUTFILE is -, standard input is read.\n" #~ msgstr "" -#~ " -n, --add-location lag «#: filenavn:linje»-linjer " -#~ "(forvalgt)\n" +#~ " -n, --add-location lag «#: filenavn:linje»-linjer (forvalgt)\n" #~ " --omit-header ikkje lag startseksjon med «msgid \"\"»\n" #~ " -p, --output-dir=KAT plassér utfiler i filkatalogen KAT\n" #~ " -s, --sort-output sortér utdata og ta bort duplikat\n" diff --git a/gettext-runtime/po/pl.po b/gettext-runtime/po/pl.po index ea6cdf045..60dc09701 100644 --- a/gettext-runtime/po/pl.po +++ b/gettext-runtime/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-18 02:56+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-16 16:00+0200\n" "Last-Translator: Rafa³ Maszkowski \n" "Language-Team: Polish \n" diff --git a/gettext-runtime/po/pt.po b/gettext-runtime/po/pt.po index fa3509f2b..5583281e0 100644 --- a/gettext-runtime/po/pt.po +++ b/gettext-runtime/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.15-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-05-13 21:44+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-05-18 01:13+0100\n" "Last-Translator: Helder Correia \n" "Language-Team: Portuguese \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "erro de escrita" @@ -23,78 +23,76 @@ msgstr "erro de escrita" msgid "Unknown system error" msgstr "Erro desconhecido do sistema" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: a opção `%s' é ambígua\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: a opção `--%s' não permite um argumento\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: a opção `%c%s' não permite um argumento\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: a opção `%s' requere um argumento\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opção não reconhecida `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opção não reconhecida `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opção ilegal -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opção ilegal -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opção requere um argumento -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: a opção '-W %s' é ambígua\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: a opção '-W %s' não permite um argumento\n" -#: gnulib-lib/xmalloc.c:38 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "memória esgotada" -#: src/envsubst.c:113 src/gettext.c:134 src/ngettext.c:124 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"Este programa é livre; veja o código fonte para condições de cópia. NÃO há qualquer\n" -"garantia; nem mesmo para COMERCIALIZAÇÃO ou UTILIDADE PARA UM PROPÓSITO PARTICULAR.\n" #: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format @@ -314,3 +312,16 @@ msgstr "" "stdout. Em vez disso as mensagens encontradas no catálogo seleccionado\n" "são traduzidas.\n" "Pasta padrão de pesquisa: %s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "Este programa é livre; veja o código fonte para condições de cópia. NÃO " +#~ "há qualquer\n" +#~ "garantia; nem mesmo para COMERCIALIZAÇÃO ou UTILIDADE PARA UM PROPÓSITO " +#~ "PARTICULAR.\n" diff --git a/gettext-runtime/po/pt_BR.po b/gettext-runtime/po/pt_BR.po index 4247a6403..bcc208ea6 100644 --- a/gettext-runtime/po/pt_BR.po +++ b/gettext-runtime/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.36\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2001-04-03 08:25+02:00\n" "Last-Translator: Flávio Bruno Leitner \n" "Language-Team: Brazilian Portuguese \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "" @@ -25,140 +25,138 @@ msgstr "" msgid "Unknown system error" msgstr "Erro de sistema desconhecido" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opção `%s' é ambígua\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opção `--%s' não aceita parâmetros\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: opção `%c%s' não aceita parâmetros\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: opção `%s' requer um argumento\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opção não reconhecida `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opção não reconhecida `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opção ilegal -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opção inválida -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opção requer um argumento -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opção `-W %s' é ambígua\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opção `-W %s' não aceita parâmetros\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "Memória insuficiente" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"Este é um sofware livre; veja os fontes para condições de cópia. Não existe\n" -"garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA FINALIDADE.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "excesso de parâmetros" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "parâmetros não informados" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Tente `%s --help' para maiores informações\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -169,45 +167,49 @@ msgid "" "standard input are substituted.\n" msgstr "" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" msgstr "" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 #, fuzzy msgid "Report bugs to .\n" msgstr "Reporte bugs para .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "entrada padrão" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:254 +#: src/gettext.c:253 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -229,7 +231,7 @@ msgstr "" " [DOMÍNIO] MSGID recupera mensagens traduzidas correspondentes\n" " para MSGID no DOMÍNIO\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -251,19 +253,19 @@ msgstr "" "mensagens encontradas no catálogo selecionado\n" "Diretório de pesquisa padrão: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, fuzzy, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -285,7 +287,7 @@ msgstr "" " [DOMÍNIO] MSGID recupera mensagens traduzidas correspondentes\n" " para MSGID no DOMÍNIO\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -304,6 +306,19 @@ msgstr "" "mensagens encontradas no catálogo selecionado\n" "Diretório de pesquisa padrão: %s\n" +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "Este é um sofware livre; veja os fontes para condições de cópia. Não " +#~ "existe\n" +#~ "garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA " +#~ "FINALIDADE.\n" + #~ msgid "error while opening \"%s\" for reading" #~ msgstr "erro ao abrir \"%s\" para leitura" diff --git a/gettext-runtime/po/ro.po b/gettext-runtime/po/ro.po index a7e99e6d6..7dbea806d 100644 --- a/gettext-runtime/po/ro.po +++ b/gettext-runtime/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.13-pre1\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2003-11-23 09:19+0200\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "eroare de scriere" @@ -23,139 +23,138 @@ msgstr "eroare de scriere" msgid "Unknown system error" msgstr "Eroare de sistem necunoscutã" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opþiunea `%s' este ambiguã\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opþiunea `--%s' nu permite parametri\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: opþiunea `%c%s' nu permite parametri\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: opþiunea `%s' necesitã un parametru\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opþiune necunoscutã `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opþiune necunoscutã `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opþiune ilegalã -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opþiune invalidã -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opþiunea necesitã un parametru -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opþiunea `-W %s' este ambiguã\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opþiunea `-W %s' nu permite parametri\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "memorie plinã" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"Acesta este software liber; citiþi sursele pentru condiþii de copiere. NU existã nici o garanþie; nici mãcar pentru VANDABILITATE sau MODIFICARE ÎNTR-UN SCOP PRIVAT.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Scris de %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "prea mulþi parametri" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "parametri lipsã" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Încercaþi `%s --help' pentru mai multe informaþii.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Folosire: %s [OPÞIUNE] [FORMAT-SHELL]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "Înlocuieºte valorile variabilelor de mediu.\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "Mod de operare:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr " -v, --variables afiºeazã variabilele din FORMAT-SHELL\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Output informativ:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help afiºeazã acest ajutor ºi iese\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version afiºeazã informaþii despre versiune ºi iese\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -173,7 +172,7 @@ msgstr "" "toate referinþele variabilelor de mediu din intrarea(input) standard sunt\n" "substituite.\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -183,25 +182,29 @@ msgstr "" "(output) va consta în variabilele de mediula care se face referire în\n" "FORMAT-SHELL, câte una pe linie.\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "Raportaþi bug-urile la .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "eroare în citirea \"%s\"" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "intrare(input) standard" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -210,12 +213,12 @@ msgstr "" "Folosire: %s [OPÞIUNE] [[DOMENIU_TEXT] MSGID]\n" "sau: %s [OPÞIUNE] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Afiºeazã traducerea din limbã nativã a unui mesaj textual.\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -236,7 +239,7 @@ msgstr "" " [DOMENIU_TEXT] MSGID preia mesajele traduse corespunzãtoare\n" " lui MSGID din DOMENIU_TEXT\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -257,12 +260,12 @@ msgstr "" "sunt traduse acele mesaje care sunt gãsite în catalogul selectat.\n" "Directorul de cãutare standard: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Folosire: %s [OPÞIUNE] [DOMENIU_TEXT] MSGID MSGID-PLURAL NUMÃRARE\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -271,7 +274,7 @@ msgstr "" "Afiºeazã traducerea din limba nativã a mesajului textual a cãrui formã\n" "gramaticalã depinde de un numãr.\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -292,7 +295,7 @@ msgstr "" " MSGID MSGID-PLURAL traduce MSGID (singular) / MSGID-PLURAL (plural)\n" " NUMÃRARE alege forma singularã/pluralã bazatã pe aceastã valoare\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -306,3 +309,15 @@ msgstr "" "este gãsit în directorul obiºnuit, o altã locaþie poate fi specificatã în variabila de\n" "mediu TEXTDOMAINDIR.\n" "Directorul de cãutare standard: %s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "Acesta este software liber; citiþi sursele pentru condiþii de copiere. " +#~ "NU existã nici o garanþie; nici mãcar pentru VANDABILITATE sau MODIFICARE " +#~ "ÎNTR-UN SCOP PRIVAT.\n" diff --git a/gettext-runtime/po/ru.po b/gettext-runtime/po/ru.po index 56dac9730..ba06f2aae 100644 --- a/gettext-runtime/po/ru.po +++ b/gettext-runtime/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.16\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-05-13 21:44+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-06-14 09:43+0400\n" "Last-Translator: Oleg S. Tihonov \n" "Language-Team: Russian \n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ" @@ -24,79 +24,76 @@ msgstr " msgid "Unknown system error" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: gnulib-lib/xmalloc.c:38 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "ÏÐÅÒÁÔÉ×ÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ" -#: src/envsubst.c:113 src/gettext.c:134 src/ngettext.c:124 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"üÔÏ Ó×ÏÂÏÄÎÁÑ ÐÒÏÇÒÁÍÍÁ; ÐÏÄÒÏÂÎÏÓÔÉ Ï ÕÓÌÏ×ÉÑÈ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ\n" -"× ÉÓÈÏÄÎÏÍ ÔÅËÓÔÅ. íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ; ÄÁÖÅ ÇÁÒÁÎÔÉÊ\n" -"ëïííåòþåóëïê ãåîîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n" #: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format @@ -313,3 +310,16 @@ msgstr "" "ÎÁÊÄÅÎ × ÓÔÁÎÄÁÒÔÎÏÍ ËÁÔÁÌÏÇÅ, ÍÏÖÎÏ ÕËÁÚÁÔØ ÄÒÕÇÏÊ ËÁÔÁÌÏÇ Ó ÐÏÍÏÝØÀ\n" "ÐÅÒÅÍÅÎÎÏÊ ÓÒÅÄÙ TEXTDOMAINDIR.\n" "óÔÁÎÄÁÒÔÎÙÊ ËÁÔÁÌÏÇ ÐÏÉÓËÁ: %s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "üÔÏ Ó×ÏÂÏÄÎÁÑ ÐÒÏÇÒÁÍÍÁ; ÐÏÄÒÏÂÎÏÓÔÉ Ï ÕÓÌÏ×ÉÑÈ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ " +#~ "ÓÍÏÔÒÉÔÅ\n" +#~ "× ÉÓÈÏÄÎÏÍ ÔÅËÓÔÅ. íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ; ÄÁÖÅ ÇÁÒÁÎÔÉÊ\n" +#~ "ëïííåòþåóëïê ãåîîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n" diff --git a/gettext-runtime/po/sk.po b/gettext-runtime/po/sk.po index 5bdcd472b..5ecf60feb 100644 --- a/gettext-runtime/po/sk.po +++ b/gettext-runtime/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext-runtime 0.16\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-05-13 21:44+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-06-24 20:09+0200\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "chyba zápisu" @@ -24,79 +24,76 @@ msgstr "chyba zápisu" msgid "Unknown system error" msgstr "Neznáma systémová chyba" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: voľba `%s' nie je jednoznačná\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: voľba `--%s' nepovoľuje parameter\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: voľba `%c%s' nepovoľuje parameter\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: voľba `%s' vyžaduje parameter\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: neznáma voľba `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: neznáma voľba `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: neprípustná voľba -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: neplatná voľba -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: voľba vyžaduje parameter -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: voľba `-W %s' nie je jednoznačná\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: voľba `-W %s' nedovoľuje použitie parametra\n" -#: gnulib-lib/xmalloc.c:38 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "pamäť je vyčerpaná" -#: src/envsubst.c:113 src/gettext.c:134 src/ngettext.c:124 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Autorské práva (C) %s Free Software Foundation, Inc.\n" -"Toto je voľne šíriteľný softvér; pre podmienky kopírovania pozri zdrojový kód.\n" -"Neposkytuje sa ŽIADNA záruka; ani čo sa týka OBCHODOVATEĽNOSTI alebo VHODNOSTI\n" -"NA KONKRÉTNY ÚČEL.\n" #: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format @@ -316,3 +313,17 @@ msgstr "" "TEXTDOMAIN. Ak sa katalóg správ nenachádza v obvyklom adresári, iné umiestnenie\n" "môže byÅ¥ určené obsahom premennej prostredia TEXTDOMAINDIR.\n" "Å tandardný adresár, v ktorom sa budú hľadaÅ¥ katalógy: %s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Autorské práva (C) %s Free Software Foundation, Inc.\n" +#~ "Toto je voľne šíriteľný softvér; pre podmienky kopírovania pozri zdrojový " +#~ "kód.\n" +#~ "Neposkytuje sa ŽIADNA záruka; ani čo sa týka OBCHODOVATEĽNOSTI alebo " +#~ "VHODNOSTI\n" +#~ "NA KONKRÉTNY ÚČEL.\n" diff --git a/gettext-runtime/po/sl.po b/gettext-runtime/po/sl.po index e7af2eed1..98a707f5c 100644 --- a/gettext-runtime/po/sl.po +++ b/gettext-runtime/po/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-18 02:56+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-16 09:38+0200\n" "Last-Translator: Primož Peterlin \n" "Language-Team: Slovenian \n" diff --git a/gettext-runtime/po/sr.po b/gettext-runtime/po/sr.po index dd300f5f8..fbd5b16c6 100644 --- a/gettext-runtime/po/sr.po +++ b/gettext-runtime/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.13-pre1\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2003-11-18 23:48+0100\n" "Last-Translator: Danilo Segan \n" "Language-Team: Serbian \n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "грешка при упису" @@ -24,140 +24,138 @@ msgstr "грешка при упису" msgid "Unknown system error" msgstr "Непозната системска грешка" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: опција „%s“ није једнозначна\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: опција „--%s“ не дозвољава аргументе\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: опција „%c%s“ не дозвољава аргументе\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: опција „%s“ захтева аргумент\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: непозната опција „--%s“\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: непозната опција „%c%s“\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: неисправна опција %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: неисправна опција -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: опција захтева аргумент -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: опција „-W %s“ није једнозначна\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "меморија исцрпљена" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Сва права задржана © %s Free Software Foundation, Inc.\n" -"Ово је слободан софтвер; погледајте изворни код за услове умножавања. НЕМА\n" -"гаранције; чак ни за употребљивост или одређену намену.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Написао је %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "превише аргумената" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "недостају аргументи" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Пробајте „%s --help“ за више података.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Употреба: %s [ОПЦИЈА] [ФОРМАТ-ЉУСКЕ]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "Замењује вредности променљивих из окружења.\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "Начин рада:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr " -v, --variables исписује променљиве из ФОРМАТ-ЉУСКЕ\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Обавештајни излаз:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help прикажи ову помоћ и изађи\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version испиши податке о издању и изађи\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -173,7 +171,7 @@ msgstr "" "наведене се замењују; иначе, све променљиве окружења наведене у стандардном\n" "улазу се замењују.\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -182,25 +180,29 @@ msgstr "" "Када се користи --variables, занемарује се стандардни улаз, а излаз се састоји \n" "из променљивих окружења које се помињу у ФОРМАТ-ЉУСКЕ, једна променљива по реду.\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "Пријавите грешке на .\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "грешка при читању „%s“" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "стандардни улаз" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -209,12 +211,12 @@ msgstr "" "Употреба: %s [ОПЦИЈА] [[ДОМЕН ТЕКСТА] MSGID]\n" "или: %s [ОПЦИЈА] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Прикажи превод текстуалне поруке у природном језику.\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -235,7 +237,7 @@ msgstr "" " [ДОМЕНТЕКСТА] MSGID користи преведену поруку за MSGID из \n" " ДОМЕНТЕКСТА\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -256,12 +258,12 @@ msgstr "" "које постоје у изабраном каталогу се преводе.\n" "Уобичајени директоријум за тражење: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Употреба: %s [ОПЦИЈА] [ДОМЕНТЕКСТА] MSGID MSGID-МНОЖИНА БРОЈ\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -270,7 +272,7 @@ msgstr "" "Прикажи превод у природном језику за текстуалну поруку чији \n" "облик зависи од броја.\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -292,7 +294,7 @@ msgstr "" " MSGID MSGID-МНОЖИНА преведи облик једнине/множине\n" " БРОЈ изабери облик једнине/множине према овој вредности\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -306,3 +308,15 @@ msgstr "" "у обичном директоријуму, други директоријум се може навести помоћу \n" "променљиве окружења TEXTDOMAINDIR.\n" "Уобичајени директоријум за тражење: %s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Сва права задржана © %s Free Software Foundation, Inc.\n" +#~ "Ово је слободан софтвер; погледајте изворни код за услове умножавања. " +#~ "НЕМА\n" +#~ "гаранције; чак ни за употребљивост или одређену намену.\n" diff --git a/gettext-runtime/po/sv.po b/gettext-runtime/po/sv.po index 1574d19a8..3dd973ba3 100644 --- a/gettext-runtime/po/sv.po +++ b/gettext-runtime/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-18 02:56+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-17 17:51+0200\n" "Last-Translator: Jan Djärv \n" "Language-Team: Swedish \n" diff --git a/gettext-runtime/po/tr.po b/gettext-runtime/po/tr.po index 6275fb52a..5855dcbe4 100644 --- a/gettext-runtime/po/tr.po +++ b/gettext-runtime/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.15-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2006-07-01 08:58+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.9.1\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "yazma hatası" @@ -24,141 +24,138 @@ msgstr "yazma hatası" msgid "Unknown system error" msgstr "Bilinmeyen sistem hatası" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: `%s' seçeneği belirsiz\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: `--%s' seçeneği argümansız kullanılır\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: `--%s' seçeneği bilinmiyor\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: `%c%s' seçeneği bilinmiyor\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: kuraldışı seçenek -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: geçersiz seçenek -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: seçenek için bir argüman gerekli -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: `-W %s' seçeneği belirsiz\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "bellek tükendi" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Telif Hakkı (C) %s Free Software Foundation, Inc.\n" -"Bu bir serbest yazılımdır; kopyalama koşulları için kaynak koduna bakınız.\n" -"Hiçbir garantisi yoktur; hatta SATILABÄ°LÄ°RLİĞİ veya ŞAHSÄ° KULLANIMINIZA\n" -"UYGUNLUĞU için bile garanti verilmez.\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "%s tarafından yazıldı.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "çok fazla argüman" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "argümanlar eksik" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Kullanımı: %s [SEÇENEK] [KABUK-BİÇİMÄ°]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "Ortam değişkenlerinin değerleri ikame edilir.\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "İşlem kipi:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr " -v, --variables KABUK-BİÇİMÄ° içindeki değişkenleri çıktılar\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Bilgilendirici çıktı:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help bu yardım iletisini gösterir ve çıkar\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version Sürüm bilgilerini gösterir ve çıkar\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -175,7 +172,7 @@ msgstr "" "Aksi takdirde, standart girdideki ortam değişkenlerinin tümüne bu ikame\n" "işlemi uygulanır.\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -185,27 +182,31 @@ msgstr "" "her satırda bir tane olmak üzere KABUK-BİÇİMÄ° içindeki ortam değişkenleri\n" "çıktılanır.\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "" "Yazılım hatalarını adresine,\n" "Çeviri hatalarını adresine bildiriniz.\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "\"%s\" okunurken hata" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "standart girdi" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -214,12 +215,12 @@ msgstr "" "Kullanımı: %s [SEÇENEK] [[PAKET] MSGID]\n" "ya da: %s [SEÇENEK] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Bir iletinin anadile çevirisini gösterir.\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -239,7 +240,7 @@ msgstr "" " -V, --version sürüm bilgilerini gösterir ve çıkar\n" " [PAKET] MSGID PAKET.mo dosyasından MSGID ile ilişkili çeviriyi alır\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -258,19 +259,19 @@ msgstr "" "Ancak iletiyi standart çıktıya basitçe kopyalamak yerine çevirisini verir.\n" "Standart arama dizini: %s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Kullanımı: %s [SEÇENEK] [PAKET] MSGID MSGID-PLURAL SAYI\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "Bir sayıya bağlı olarak ilgili tekil/çoğul ileti çevirisini gösterir.\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -291,7 +292,7 @@ msgstr "" " MSGID MSGID-PLURAL MSGID (tekil) / MSGID-PLURAL (çoğul) çevrilir\n" " SAYI SAYIya bağlı olarak tekil/çoğul iletilerden biri seçilir\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -305,6 +306,19 @@ msgstr "" "TEXTDOMAINDIR çevre değişkeni ile belirtilebilir.\n" "Standart arama dizini: %s\n" +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Telif Hakkı (C) %s Free Software Foundation, Inc.\n" +#~ "Bu bir serbest yazılımdır; kopyalama koşulları için kaynak koduna " +#~ "bakınız.\n" +#~ "Hiçbir garantisi yoktur; hatta SATILABÄ°LÄ°RLİĞİ veya ŞAHSÄ° KULLANIMINIZA\n" +#~ "UYGUNLUĞU için bile garanti verilmez.\n" + #~ msgid "invalid argument `%s' for `%s'" #~ msgstr "argüman `%s' `%s' için geçersiz" diff --git a/gettext-runtime/po/uk.po b/gettext-runtime/po/uk.po index 35170c45c..0f0c5991a 100644 --- a/gettext-runtime/po/uk.po +++ b/gettext-runtime/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.16\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-05-13 21:44+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-07-05 17:30+0200\n" "Last-Translator: Maxim V. Dziumanenko \n" "Language-Team: Ukrainian \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "помилка запису" @@ -23,79 +23,76 @@ msgstr "помилка запису" msgid "Unknown system error" msgstr "Невідома системна помилка" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: неоднозначний параметр `%s'\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: параметр `--%s' має використовуватись без аргументів\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: параметр `%c%s' має використовуватись без аргументів\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: параметр `%s' має використовуватись з аргументом\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: нерозпізнаний параметр `--%s'\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: нерозпізнаний параметр `%c%s'\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: неправильний параметр -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: неправильний параметр -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: параметр %c має використовуватись з аргументом\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: неоднозначний параметр `-W %s'\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: параметр `-W %s' має використовуватись без аргументів\n" -#: gnulib-lib/xmalloc.c:38 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "пам'ять вичерпано" -#: src/envsubst.c:113 src/gettext.c:134 src/ngettext.c:124 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Авторські права (C) %s Free Software Foundation, Inc.\n" -"Це - вільне програмне забезпечення; умови копіювання викладені у вихідному\n" -"коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ\n" -"або ПРИДАТНОСТІ ДО ПЕВНОЇ МЕТИ.\n" #: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format @@ -311,3 +308,17 @@ msgstr "" "відсутній у стандартному каталозі, можна вказати інший каталог за допомогою\n" "змінної оточення TEXTDOMAINDIR.\n" "Стандартний каталог пошуку: %s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Авторські права (C) %s Free Software Foundation, Inc.\n" +#~ "Це - вільне програмне забезпечення; умови копіювання викладені у " +#~ "вихідному\n" +#~ "коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ " +#~ "ПРИДАТНОСТІ\n" +#~ "або ПРИДАТНОСТІ ДО ПЕВНОЇ МЕТИ.\n" diff --git a/gettext-runtime/po/vi.po b/gettext-runtime/po/vi.po index da4f24536..69bf98fef 100644 --- a/gettext-runtime/po/vi.po +++ b/gettext-runtime/po/vi.po @@ -1,12 +1,12 @@ # Vietnamese Translation for Gettext Runtime. # Copyright © 2007 Free Software Foundation, Inc. # Clytie Siddall , 2005-2007. -# +# msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.16.2-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2007-10-18 02:56+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2007-10-17 16:23+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" diff --git a/gettext-runtime/po/zh_CN.po b/gettext-runtime/po/zh_CN.po index 65609a8f8..d183d694f 100644 --- a/gettext-runtime/po/zh_CN.po +++ b/gettext-runtime/po/zh_CN.po @@ -1,165 +1,161 @@ -# Simplified Chinese translation for gettext. -# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. -# Yuan-Chung Cheng , 1998. -# Pofeng Lee , 2001-2002. -# Abel Cheung , 2002. -# Liu Songhe , 2003. +# Chinese translations for GNU gettext-runtime package. +# Copyright (C) 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the GNU gettext-runtime package. +# Bruno Haible , 2007. # msgid "" msgstr "" -"Project-Id-Version: gettext-runtime 0.15-pre5\n" +"Project-Id-Version: GNU gettext-runtime\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" -"PO-Revision-Date: 2006-08-22 23:02+0800\n" -"Last-Translator: Funda Wang \n" -"Language-Team: Chinese (simplified) \n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" +"PO-Revision-Date: 2007-06-28 13:08+0200\n" +"Last-Translator: Bruno Haible \n" +"Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" -msgstr "写错误" +msgstr "" #: gnulib-lib/error.c:125 msgid "Unknown system error" -msgstr "未知的系统错误" +msgstr "" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" -msgstr "%s：选项“%s”是不明确的\n" +msgstr "" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" -msgstr "%s：选项“--%s”不允许有参数\n" +msgstr "" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" -msgstr "%s：选项“%c%s”不允许有参数\n" +msgstr "" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s：选项“%s”需要一个参数\n" +msgstr "" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" -msgstr "%s：无法识别的选项“--%s”\n" +msgstr "" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" -msgstr "%s：无法识别的选项“%c%s”\n" +msgstr "" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" -msgstr "%s：非法选项 ─ %c\n" +msgstr "" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" -msgstr "%s：无效选项 ─ %c\n" +msgstr "" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" -msgstr "%s：选项需要一个参数 ─ %c\n" +msgstr "" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" -msgstr "%s：选项“-W %s”是不明确的\n" +msgstr "" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" -msgstr "%s：选项“-W %s”不允许有参数\n" +msgstr "" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" -msgstr "内存耗尽" +msgstr "" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"版权所有 (C) %s Free Software Foundation, Inc.\n" -"这是自由软件；请参考原始码的版权声明。本软件不提供任何担保，甚至不会包括\n" -"可售性或适用于任何特定目的的担保。\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" -msgstr "由 %s 编写。\n" +msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" -msgstr "Bruno Haible" +msgstr "" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" -msgstr "参数过多" +msgstr "" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" -msgstr "缺少了参数" +msgstr "" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "试试“%s --help”来获取更多信息。\n" +msgstr "" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" -msgstr "用法：%s [选项] [SHELL格式]\n" +msgstr "" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" -msgstr "替换环境变量的值。\n" +msgstr "" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" -msgstr "操作模式：\n" +msgstr "" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" -msgstr " -v, --variables 输出 SHELL格式 中出现的变量\n" +msgstr "" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" -msgstr "信息性输出：\n" +msgstr "" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" -msgstr " -h, --help 显示此帮助并退出\n" +msgstr "" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" -msgstr " -V, --version 输出版本信息并退出\n" +msgstr "" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -169,52 +165,49 @@ msgid "" "substituted; otherwise all environment variables references occurring in\n" "standard input are substituted.\n" msgstr "" -"在普通操作模式下，会将标准输入复制到标准输出中，而以 $VARIABLE 或 ${VARIABLE}\n" -"格式给出的环境变量引用会被替换成相应的值。如果给出了 SHELL格式，则只有在该格式\n" -"中引用的环境变量会被替换；否则，标准输入中出现的全部环境变量引用都将被替换。\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" msgstr "" -"若使用了 --variables，则会忽略标准输入，而输出由 SHELL格式 引用的环境变量组成，\n" -"每行出现一个环境变量。\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" -msgstr "将错误报告至 。\n" +msgstr "" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" -msgstr "读取“%s”时出错" +msgstr "" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" -msgstr "标准输入" +msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" -msgstr "Ulrich Drepper" +msgstr "" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -"用法：%s [选项] [[文本域] MSGID]\n" -"或： %s [选项] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" -msgstr "显示某原文消息的本地语言翻译。\n" +msgstr "" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -226,15 +219,8 @@ msgid "" " [TEXTDOMAIN] MSGID retrieve translated message corresponding\n" " to MSGID from TEXTDOMAIN\n" msgstr "" -" -d, --domain=文本域 由<文本域>读取翻译后的消息\n" -" -e 允许展开某些转义字符\n" -" -E (为了兼容性存在的选项，不会造成任何影响)\n" -" -h, --help 显示此段说明消息并退出\n" -" -n 禁用尾随的换行符\n" -" -V, --version 显示版本信息并退出\n" -" [文本域] MSGID 由<文本域>读取相应于 MSGID 的翻译消息\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -246,26 +232,20 @@ msgid "" "found in the selected catalog are translated.\n" "Standard search directory: %s\n" msgstr "" -"假如没有指定<文本域>参数，程序会根据 TEXTDOMAIN 环境变量来设定<文本域>。\n" -"假如消息一览表文件不在正常的目录下，可以用环境变量 TEXTDOMAINDIR 指定\n" -"消息一览表文件所在的位置。\n" -"使用选项“-s”时此程序和“echo”命令类似。但它不是直接把参数复制至标准\n" -"输出，而是寻找消息一览表文件里翻译过的消息。\n" -"标准的搜索目录为：%s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -msgstr "用法：%s [选项] [文本域] MSGID 复数-MSGID 数字\n" +msgstr "" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" -msgstr "显示某原文消息的本地语言翻译，而翻译的语法和数字有关。\n" +msgstr "" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -277,16 +257,8 @@ msgid "" " MSGID MSGID-PLURAL translate MSGID (singular) / MSGID-PLURAL (plural)\n" " COUNT choose singular/plural form based on this value\n" msgstr "" -" -d, --domain=文本域 由<文本域>读取翻译后的消息。\n" -" -e 允许展开某些转义字符\n" -" -E (为了兼容性存在的选项，不会造成任何影响)\n" -" -h, --help 显示此段说明并退出\n" -" -V, --version 显示版本信息并退出\n" -" [文本域] 由<文本域>读取翻译消息\n" -" MSGID 复数-MSGID 翻译 MSGID (单数) / 复数-MSGID (复数)\n" -" 数字 根据<数字>来选择单数或复数型态\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -295,7 +267,3 @@ msgid "" "variable TEXTDOMAINDIR.\n" "Standard search directory: %s\n" msgstr "" -"假如没有指定<文本域>参数，程序会根据 TEXTDOMAIN 环境变量来设定文本域。\n" -"假如消息一览表文件不在正常的目录下，可以用环境变量 TEXTDOMAINDIR 指定\n" -"消息一览表文件所在的位置。\n" -"标准的搜索目录为：%s\n" diff --git a/gettext-runtime/po/zh_HK.po b/gettext-runtime/po/zh_HK.po index 346d64333..b5a45c6cf 100644 --- a/gettext-runtime/po/zh_HK.po +++ b/gettext-runtime/po/zh_HK.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.15-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2006-07-05 17:16+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (Hong Kong) \n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "寫入時發生錯誤" @@ -27,140 +27,138 @@ msgstr "寫入時發生錯誤" msgid "Unknown system error" msgstr "不明的系統錯誤" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s：選項「%s」不明確\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s：選項「--%s」不允許有參數\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s：選項「%c%s」不允許有參數\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s：選項「%s」需要參數\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s：無法識別選項「--%s」\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s：無法識別選項「%c%s」\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s：選項不合法 -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s：選項無效 -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s：選項需要參數 -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s：選項「-W %s」不明確\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s：選項「-W %s」不允許有參數\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "記憶體耗盡" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"版權所有 (C) %s Free Software Foundation, Inc.\n" -"這是自由軟件；請參考源代碼的版權聲明。本軟件不提供任何保證，甚至不會包括\n" -"可售性和適用於任何特定目的的保證。\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "由 %s 編寫。\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "參數過多" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "缺少了參數" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "如果想獲取額外資訊，請嘗試執行「%s --help」。\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "用法：%s [選項] [SHELL-FORMAT]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "替換環境變數的值。\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "操作模式:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr " -v, --variables 顯示 SHELL-FORMAT 中出現過的環境變數\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "顯示資訊:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help 顯示這段說明文字並結束\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version 顯示版本資訊並結束\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -174,7 +172,7 @@ msgstr "" "${VARIABLE}) 轉換為該變數的值，並在標準輸出顯示結果。如果指定了 SHELL-FORMAT，\n" "則只替換 SHELL-FORMAT 中指定的變數，否則所有環境變數都會替換。\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -183,25 +181,29 @@ msgstr "" "如果使用 --variables 選項，將不會理會輸入資料，只會讀取 SHELL-FORMAT 中的\n" "環境變數並顯示變數名稱，每個一行。\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "請向 匯報錯誤。\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "讀取「%s」時出現錯誤" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "標準輸入" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -210,12 +212,12 @@ msgstr "" "用法：%s [選項] [[文字領域] MSGID]\n" "或： %s [選項] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "顯示某個文字訊息的本地語言翻譯。\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -235,7 +237,7 @@ msgstr "" " -V, --version 顯示版本資訊並結束\n" " [文字領域] MSGID 由<文字領域>讀取相應於 MSGID 的翻譯訊息\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -254,19 +256,19 @@ msgstr "" "而是尋找訊息資料檔裏翻譯過的訊息。\n" "標準的搜尋目錄為：%s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "用法：%s [選項] [文字領域] MSGID 複數MSGID 數字\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "顯示某文字訊息的本地語言翻譯，而翻譯的文法受單數複數影響。\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -287,7 +289,7 @@ msgstr "" " MSGID 複數MSGID 翻譯 MSGID (單數) / 複數MSGID (複數)\n" " 數字 根據<數字>來選擇單數或複數型態\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -300,3 +302,14 @@ msgstr "" "假如訊息資料檔不在正常的目錄下，可以用環境變數 TEXTDOMAINDIR 指定訊息資料檔\n" "的所在的位置。\n" "標準的搜尋目錄為：%s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "版權所有 (C) %s Free Software Foundation, Inc.\n" +#~ "這是自由軟件；請參考源代碼的版權聲明。本軟件不提供任何保證，甚至不會包括\n" +#~ "可售性和適用於任何特定目的的保證。\n" diff --git a/gettext-runtime/po/zh_TW.po b/gettext-runtime/po/zh_TW.po index 558b2631c..0b8369571 100644 --- a/gettext-runtime/po/zh_TW.po +++ b/gettext-runtime/po/zh_TW.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext-runtime 0.15-pre5\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-10-02 16:24+0200\n" +"POT-Creation-Date: 2007-11-02 03:22+0100\n" "PO-Revision-Date: 2006-07-05 17:21+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: gnulib-lib/closeout.c:67 +#: gnulib-lib/closeout.c:66 msgid "write error" msgstr "寫入時發生錯誤" @@ -27,140 +27,138 @@ msgstr "寫入時發生錯誤" msgid "Unknown system error" msgstr "不明的系統錯誤" -#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547 +#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s：選項「%s」不明確\n" -#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584 +#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s：選項「--%s」不允許有參數\n" -#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598 +#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s：選項「%c%s」不允許有參數\n" -#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976 -#: gnulib-lib/getopt.c:995 +#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975 +#: gnulib-lib/getopt.c:994 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s：選項「%s」需要參數\n" -#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701 +#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s：無法識別選項「--%s」\n" -#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712 +#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s：無法識別選項「%c%s」\n" -#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767 +#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s：選項不合法 -- %c\n" -#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776 +#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s：選項無效 -- %c\n" -#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048 -#: gnulib-lib/getopt.c:1066 +#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047 +#: gnulib-lib/getopt.c:1065 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s：選項需要參數 -- %c\n" -#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913 +#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s：選項「-W %s」不明確\n" -#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955 +#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s：選項「-W %s」不允許有參數\n" -#: gnulib-lib/xmalloc.c:39 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "記憶體耗盡" -#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"版權所有 (C) %s Free Software Foundation, Inc.\n" -"這是自由軟體；請參考原始碼的版權聲明。本軟體不提供任何保證，甚至不會包括\n" -"可售性和適用於任何特定目的的保證。\n" -#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "由 %s 編寫。\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:119 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "參數過多" -#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "缺少了參數" -#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "如果想獲取額外資訊，請嘗試執行「%s --help」。\n" -#: src/envsubst.c:177 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "用法：%s [選項] [SHELL-FORMAT]\n" -#: src/envsubst.c:182 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "替換環境變數的值。\n" -#: src/envsubst.c:186 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "操作模式:\n" -#: src/envsubst.c:189 +#: src/envsubst.c:188 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr " -v, --variables 顯示 SHELL-FORMAT 中出現過的環境變數\n" -#: src/envsubst.c:193 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "顯示資訊:\n" -#: src/envsubst.c:196 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help 顯示這段說明文字並結束\n" -#: src/envsubst.c:199 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version 顯示版本資訊並結束\n" -#: src/envsubst.c:203 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -174,7 +172,7 @@ msgstr "" "${VARIABLE}) 轉換為該變數的值，並在標準輸出顯示結果。如果指定了 SHELL-FORMAT，\n" "則只替換 SHELL-FORMAT 中指定的變數，否則所有環境變數都會替換。\n" -#: src/envsubst.c:212 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" @@ -183,25 +181,29 @@ msgstr "" "如果使用 --variables 選項，將不會理會輸入資料，只會讀取 SHELL-FORMAT 中的\n" "環境變數並顯示變數名稱，每個一行。\n" -#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "請向 匯報錯誤。\n" -#: src/envsubst.c:439 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "讀取「%s」時出現錯誤" -#: src/envsubst.c:440 +#: src/envsubst.c:443 msgid "standard input" msgstr "標準輸入" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:140 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" -#: src/gettext.c:244 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -210,12 +212,12 @@ msgstr "" "用法：%s [選項] [[文字領域] MSGID]\n" "或： %s [選項] -s [MSGID]...\n" -#: src/gettext.c:250 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "顯示某個文字訊息的本地語言翻譯。\n" -#: src/gettext.c:254 +#: src/gettext.c:253 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -235,7 +237,7 @@ msgstr "" " -V, --version 顯示版本資訊並結束\n" " [文字領域] MSGID 由<文字領域>讀取相應於 MSGID 的翻譯訊息\n" -#: src/gettext.c:265 +#: src/gettext.c:264 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -254,19 +256,19 @@ msgstr "" "而是尋找訊息資料檔裡翻譯過的訊息。\n" "標準的搜尋目錄為：%s\n" -#: src/ngettext.c:213 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "用法：%s [選項] [文字領域] MSGID 複數MSGID 數字\n" -#: src/ngettext.c:218 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "顯示某文字訊息的本地語言翻譯，而翻譯的文法受單數複數影響。\n" -#: src/ngettext.c:223 +#: src/ngettext.c:222 #, c-format, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -287,7 +289,7 @@ msgstr "" " MSGID 複數MSGID 翻譯 MSGID (單數) / 複數MSGID (複數)\n" " 數字 根據<數字>來選擇單數或複數型態\n" -#: src/ngettext.c:234 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -300,3 +302,14 @@ msgstr "" "假如訊息資料檔不在正常的目錄下，可以用環境變數 TEXTDOMAINDIR 指定訊息資料檔\n" "的所在的位置。\n" "標準的搜尋目錄為：%s\n" + +#~ msgid "" +#~ "Copyright (C) %s Free Software Foundation, Inc.\n" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "版權所有 (C) %s Free Software Foundation, Inc.\n" +#~ "這是自由軟體；請參考原始碼的版權聲明。本軟體不提供任何保證，甚至不會包括\n" +#~ "可售性和適用於任何特定目的的保證。\n" diff --git a/gettext-tools/ABOUT-NLS b/gettext-tools/ABOUT-NLS index ec20977e0..83bc72ec2 100644 --- a/gettext-tools/ABOUT-NLS +++ b/gettext-tools/ABOUT-NLS @@ -101,8 +101,11 @@ codes, stating which languages are allowed. As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate -`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, -and `CC' is an ISO 3166 two-letter country code. For example, let's +`LL_CC' combination. If you happen to have the `LC_ALL' or some other +`LC_xxx' environment variables set, you should unset them before +setting `LANG', otherwise the setting of `LANG' will not have the +desired effect. Here `LL' is an ISO 639 two-letter language code, and +`CC' is an ISO 3166 two-letter country code. For example, let's suppose that you speak German and live in Germany. At the shell prompt, merely execute `setenv LANG de_DE' (in `csh'), `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). @@ -153,8 +156,7 @@ people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, -`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" -area. +`http://translationproject.org/', in the "Teams" area. If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. @@ -168,8 +170,8 @@ message to `sv-request@li.org', having this message body: _actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to -get started, please write to `translation@iro.umontreal.ca' to reach the -coordinator for all translator teams. +get started, please write to `coordinator@translationproject.org' to +reach the coordinator for all translator teams. The English team is special. It works at improving and uniformizing the terminology in use. Proven linguistic skills are praised more than @@ -179,67 +181,62 @@ programming skills, here. ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of October -2006. The matrix shows, in regard of each package, for which languages +matrix shows the current state of internationalization, as of November +2007. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo +----------------------------------------------------+ - GNUnet | [] | + Compendium | [] [] [] [] | a2ps | [] [] [] [] [] | aegis | () | ant-phone | () | anubis | [] | ap-utils | | aspell | [] [] [] [] [] | - bash | [] [] [] | - batchelor | [] | + bash | [] | bfd | | bibshelf | [] | - binutils | [] | + binutils | | bison | [] [] | - bison-runtime | | + bison-runtime | [] | bluez-pin | [] [] [] [] [] | cflow | [] | - clisp | [] [] | + clisp | [] [] [] | console-tools | [] [] | - coreutils | [] [] [] | + coreutils | [] [] [] [] | cpio | | cpplib | [] [] [] | cryptonit | [] | - darkstat | [] () [] | - dialog | [] [] [] [] [] [] | + dialog | | diffutils | [] [] [] [] [] [] | doodle | [] | e2fsprogs | [] [] | enscript | [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] () [] | - fileutils | [] [] | - findutils | [] [] [] | + fetchmail | [] [] () [] [] | + findutils | [] | + findutils_stable | [] [] [] | flex | [] [] [] | - fslint | [] | + fslint | | gas | | gawk | [] [] [] | - gbiff | [] | gcal | [] | gcc | [] | gettext-examples | [] [] [] [] [] | gettext-runtime | [] [] [] [] [] | gettext-tools | [] [] | - gimp-print | [] [] [] [] | gip | [] | - gliv | [] | + gliv | [] [] | glunarclock | [] | gmult | [] [] | gnubiff | () | - gnucash | () () [] | - gnucash-glossary | [] () | + gnucash | [] [] () () [] | gnuedu | | - gnulib | [] [] [] [] [] [] | + gnulib | [] | + gnunet | | gnunet-gtk | | - gnutls | | + gnutls | [] | gpe-aerial | [] [] | gpe-beam | [] [] | gpe-calendar | | @@ -260,40 +257,43 @@ translation percentage of at least 50%. gpe-todo | | gphoto2 | [] [] [] [] | gprof | [] [] | - gpsdrive | () () | + gpsdrive | | gramadoir | [] [] | - grep | [] [] [] [] [] [] | - gretl | | + grep | [] [] | + gretl | () | gsasl | | gss | | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] [] [] | - gst-plugins-good | [] [] [] [] [] [] [] | + gst-plugins-bad | [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] [] | + gst-plugins-ugly | [] [] | gstreamer | [] [] [] [] [] [] [] | gtick | () | - gtkam | [] [] [] | + gtkam | [] [] [] [] | gtkorphan | [] [] | gtkspell | [] [] [] [] | gutenprint | [] | hello | [] [] [] [] [] | - id-utils | [] [] | - impost | | - indent | [] [] [] | - iso_3166 | [] [] | + herrie | [] | + hylafax | | + idutils | [] [] | + indent | [] [] [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] | iso_3166_2 | | - iso_4217 | [] | - iso_639 | [] [] | + iso_4217 | [] [] [] | + iso_639 | [] [] [] [] | jpilot | [] | jtag | | jwhois | | kbd | [] [] [] [] | - keytouch | | - keytouch-editor | | - keytouch-keyboa... | | + keytouch | [] [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | latrine | () | ld | [] | leafpad | [] [] [] [] [] | - libc | [] [] [] [] [] | + libc | [] [] [] [] | libexif | [] | libextractor | [] | libgpewidget | [] [] [] | @@ -302,76 +302,70 @@ translation percentage of at least 50%. libgphoto2_port | [] [] | libgsasl | | libiconv | [] [] | - libidn | [] [] | + libidn | [] [] [] | lifelines | [] () | lilypond | [] | lingoteach | | + lprng | | lynx | [] [] [] [] | m4 | [] [] [] [] | + mailfromd | | mailutils | [] | make | [] [] | - man-db | [] () [] [] | + man-db | [] [] [] | minicom | [] [] [] | - mysecretdiary | [] [] | nano | [] [] [] | - nano_1_0 | [] () [] [] | opcodes | [] | - parted | | - pilot-qof | [] | + parted | [] [] | + pilot-qof | | + popt | [] [] [] | psmisc | [] | pwdutils | | - python | | qof | | radius | [] | recode | [] [] [] [] [] [] | - rpm | [] [] | + rpm | [] | screem | | scrollkeeper | [] [] [] [] [] [] [] [] | sed | [] [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] | + shared-mime-info | [] [] [] [] () [] [] [] | sharutils | [] [] [] [] [] [] | shishi | | - silky | | skencil | [] () | - sketch | [] () | solfege | | soundtracker | [] [] | sp | [] | - stardict | [] | system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] | + tar | [] [] | texinfo | [] [] [] | - textutils | [] [] [] | tin | () () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | + tuxpaint | [] [] [] [] [] [] | unicode-han-tra... | | unicode-transla... | | util-linux | [] [] [] [] | - vorbis-tools | [] [] [] [] | + util-linux-ng | [] [] [] [] | + vorbis-tools | [] | wastesedge | () | wdiff | [] [] [] [] | - wget | [] [] | - xchat | [] [] [] [] [] [] | - xkeyboard-config | | - xpad | [] [] | + wget | [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] | + xpad | [] [] [] | +----------------------------------------------------+ af am ar az be bg bs ca cs cy da de el en en_GB eo - 10 0 1 2 9 22 1 42 41 2 60 95 16 1 17 16 + 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18 es et eu fa fi fr ga gl gu he hi hr hu id is it +--------------------------------------------------+ - GNUnet | | + Compendium | [] [] [] [] [] | a2ps | [] [] [] () | aegis | | ant-phone | [] | anubis | [] | ap-utils | [] [] | aspell | [] [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | [] | + bash | [] | + bfd | [] [] | bibshelf | [] [] [] | binutils | [] [] [] | bison | [] [] [] [] [] [] | @@ -384,36 +378,32 @@ translation percentage of at least 50%. cpio | [] [] [] | cpplib | [] [] | cryptonit | [] | - darkstat | [] () [] [] [] | - dialog | [] [] [] [] [] [] [] [] | + dialog | [] [] [] | diffutils | [] [] [] [] [] [] [] [] [] | doodle | [] [] | e2fsprogs | [] [] [] | enscript | [] [] [] | - error | [] [] [] [] [] | fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] | + findutils | [] [] [] | + findutils_stable | [] [] [] [] | flex | [] [] [] | - fslint | [] | + fslint | | gas | [] [] | - gawk | [] [] [] [] | - gbiff | [] | + gawk | [] [] [] [] () | gcal | [] [] | gcc | [] | - gettext-examples | [] [] [] [] [] [] | + gettext-examples | [] [] [] [] [] [] [] | gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] | - gip | [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] | gliv | () | glunarclock | [] [] [] | gmult | [] [] [] | gnubiff | () () | gnucash | () () () | - gnucash-glossary | [] [] | gnuedu | [] | - gnulib | [] [] [] [] [] [] [] [] | + gnulib | [] [] [] | + gnunet | | gnunet-gtk | | gnutls | | gpe-aerial | [] [] | @@ -435,68 +425,71 @@ translation percentage of at least 50%. gpe-today | [] [] [] [] | gpe-todo | [] | gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] | - gpsdrive | () () [] () | + gprof | [] [] [] [] [] | + gpsdrive | [] | gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] [] [] | + grep | [] [] [] | + gretl | [] [] [] () | gsasl | [] [] | - gss | [] | - gst-plugins | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | + gss | [] [] | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] | gstreamer | [] [] [] | - gtick | [] | + gtick | [] [] [] | gtkam | [] [] [] [] | gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] | gutenprint | [] | hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] [] | - impost | [] [] | + herrie | [] | + hylafax | | + idutils | [] [] [] [] [] | indent | [] [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] [] | + iso_15924 | [] | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | iso_3166_2 | [] | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] [] | + iso_4217 | [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] | jpilot | [] [] | jtag | [] | jwhois | [] [] [] [] [] | kbd | [] [] | - keytouch | [] | + keytouch | [] [] [] | keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] [] | - ld | [] [] | + keytouch-keyboa... | [] [] | + latrine | [] [] | + ld | [] [] [] [] | leafpad | [] [] [] [] [] [] | libc | [] [] [] [] [] | libexif | [] | libextractor | [] | libgpewidget | [] [] [] [] [] | - libgpg-error | | + libgpg-error | [] | libgphoto2 | [] [] [] | libgphoto2_port | [] [] | libgsasl | [] [] | - libiconv | [] [] | + libiconv | [] [] [] | libidn | [] [] | lifelines | () | - lilypond | [] | + lilypond | [] [] [] | lingoteach | [] [] [] | + lprng | | lynx | [] [] [] | m4 | [] [] [] [] | + mailfromd | | mailutils | [] [] | make | [] [] [] [] [] [] [] [] | - man-db | () | + man-db | [] | minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] [] [] [] [] [] | - nano_1_0 | [] [] [] [] [] | + nano | [] [] [] [] [] [] [] | opcodes | [] [] [] [] | - parted | [] [] [] [] | + parted | [] [] [] | pilot-qof | | - psmisc | [] [] [] | + popt | [] [] [] [] | + psmisc | [] [] | pwdutils | | - python | | qof | [] | radius | [] [] | recode | [] [] [] [] [] [] [] [] | @@ -504,565 +497,539 @@ translation percentage of at least 50%. screem | | scrollkeeper | [] [] [] | sed | [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | shared-mime-info | [] [] [] [] [] [] | sharutils | [] [] [] [] [] [] [] [] | - shishi | | - silky | [] | + shishi | [] | skencil | [] [] | - sketch | [] [] | solfege | [] | soundtracker | [] [] [] | sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] [] [] | - texinfo | [] [] | - textutils | [] [] [] [] [] | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | tin | [] () | - tp-robot | [] [] [] [] | tuxpaint | [] [] | unicode-han-tra... | | unicode-transla... | [] [] | util-linux | [] [] [] [] [] [] [] | - vorbis-tools | [] [] | + util-linux-ng | [] [] [] [] [] [] [] | + vorbis-tools | | wastesedge | () | wdiff | [] [] [] [] [] [] [] [] | wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | xpad | [] [] [] | +--------------------------------------------------+ es et eu fa fi fr ga gl gu he hi hr hu id is it - 88 22 14 2 40 115 61 14 1 8 1 6 59 31 0 52 + 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52 - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - +-------------------------------------------------+ - GNUnet | | - a2ps | () [] [] () | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | - cflow | | - clisp | [] | - console-tools | | - coreutils | [] | - cpio | | - cpplib | [] | - cryptonit | [] | - darkstat | [] [] | - dialog | [] [] | - diffutils | [] [] [] | - doodle | | - e2fsprogs | [] | - enscript | [] | - error | [] | - fetchmail | [] [] | - fileutils | [] [] | - findutils | [] | - flex | [] [] | - fslint | [] [] | - gas | | - gawk | [] [] | - gbiff | [] | - gcal | | - gcc | | - gettext-examples | [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] | - gnubiff | | - gnucash | () () | - gnucash-glossary | [] | - gnuedu | | - gnulib | [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] [] | - gpe-conf | [] [] | - gpe-contacts | [] | - gpe-edit | [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] | - gphoto2 | [] [] | - gprof | | - gpsdrive | () () () | - gramadoir | () | - grep | [] [] [] [] | - gretl | | - gsasl | [] | - gss | | - gst-plugins | [] | - gst-plugins-base | | - gst-plugins-good | [] | - gstreamer | [] | - gtick | | - gtkam | [] | - gtkorphan | [] | - gtkspell | [] [] | - gutenprint | | - hello | [] [] [] [] [] [] | - id-utils | [] | - impost | | - indent | [] [] | - iso_3166 | [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] | - jpilot | () () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | - keytouch-editor | | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] [] [] | - libexif | | - libextractor | | - libgpewidget | [] | - libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | | - libidn | [] [] | - lifelines | [] | - lilypond | | - lingoteach | [] | - lynx | [] [] | - m4 | [] [] | - mailutils | | - make | [] [] [] | - man-db | () | - minicom | [] | - mysecretdiary | [] | - nano | [] [] [] | - nano_1_0 | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] | - shishi | | - silky | [] | - skencil | | - sketch | | - solfege | | - soundtracker | | - sp | () | - stardict | [] [] | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | | - tp-robot | [] | - tuxpaint | [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] | - vorbis-tools | [] | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | - +-------------------------------------------------+ - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - 52 24 2 2 1 3 0 2 3 21 0 15 1 97 5 1 + ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn + +--------------------------------------------------+ + Compendium | [] | + a2ps | () [] [] | + aegis | () | + ant-phone | [] | + anubis | [] [] [] | + ap-utils | [] | + aspell | [] [] | + bash | [] | + bfd | | + bibshelf | [] | + binutils | | + bison | [] [] [] | + bison-runtime | [] [] [] | + bluez-pin | [] [] [] | + cflow | | + clisp | [] | + console-tools | | + coreutils | [] | + cpio | [] | + cpplib | [] | + cryptonit | [] | + dialog | [] [] | + diffutils | [] [] [] | + doodle | | + e2fsprogs | [] | + enscript | [] | + fetchmail | [] [] | + findutils | [] | + findutils_stable | [] | + flex | [] [] | + fslint | | + gas | | + gawk | [] [] | + gcal | | + gcc | | + gettext-examples | [] [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gip | [] [] | + gliv | [] | + glunarclock | [] [] | + gmult | [] [] [] | + gnubiff | | + gnucash | () () () | + gnuedu | | + gnulib | [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] | + gpe-clock | [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] | + gphoto2 | [] [] | + gprof | [] | + gpsdrive | [] | + gramadoir | () | + grep | [] [] | + gretl | | + gsasl | [] | + gss | | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] | + gtick | [] | + gtkam | [] [] | + gtkorphan | [] | + gtkspell | [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] | + herrie | [] | + hylafax | | + idutils | [] | + indent | [] [] | + iso_15924 | [] | + iso_3166 | [] [] [] [] [] [] [] [] | + iso_3166_2 | [] | + iso_4217 | [] [] [] | + iso_639 | [] [] [] [] | + jpilot | () () | + jtag | | + jwhois | [] | + kbd | [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | | + latrine | [] | + ld | | + leafpad | [] [] | + libc | [] [] [] | + libexif | | + libextractor | | + libgpewidget | [] | + libgpg-error | | + libgphoto2 | [] | + libgphoto2_port | [] | + libgsasl | [] | + libiconv | [] | + libidn | [] [] | + lifelines | [] | + lilypond | [] | + lingoteach | [] | + lprng | | + lynx | [] [] | + m4 | [] [] | + mailfromd | | + mailutils | | + make | [] [] [] | + man-db | | + minicom | [] | + nano | [] [] [] | + opcodes | [] | + parted | [] [] | + pilot-qof | | + popt | [] [] [] | + psmisc | [] [] [] | + pwdutils | | + qof | | + radius | | + recode | [] | + rpm | [] [] | + screem | [] | + scrollkeeper | [] [] [] [] | + sed | [] [] | + shared-mime-info | [] [] [] [] [] [] [] | + sharutils | [] [] | + shishi | | + skencil | | + solfege | () () | + soundtracker | | + sp | () | + system-tools-ba... | [] [] [] [] | + tar | [] [] [] | + texinfo | [] [] | + tin | | + tuxpaint | () [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] | + util-linux-ng | [] [] | + vorbis-tools | | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] | + xchat | [] [] [] [] | + xkeyboard-config | [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn + 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6 - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +------------------------------------------------------+ - GNUnet | | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - darkstat | [] [] [] [] [] [] | - dialog | [] [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] [] | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] [] [] [] | - gas | | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gimp-print | [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () | - gnucash | () [] | - gnucash-glossary | [] [] [] | - gnuedu | | - gnulib | [] [] [] [] [] | - gnunet-gtk | [] | - gnutls | [] [] | - gpe-aerial | [] [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] | - gpe-clock | [] [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] [] | - gpe-contacts | [] [] [] [] [] | - gpe-edit | [] [] [] [] [] [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] [] | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] | - gretl | [] | - gsasl | [] [] [] | - gss | [] [] [] | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] | - gst-plugins-good | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] | - gtkam | [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - impost | [] | - indent | [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] | - ld | [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] [] | - libgpewidget | [] [] [] [] [] [] [] | - libgpg-error | [] [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] | - libidn | [] [] () | - lifelines | [] [] | - lilypond | | - lingoteach | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailutils | [] [] [] [] | - make | [] [] [] [] | - man-db | [] [] | - minicom | [] [] [] [] [] | - mysecretdiary | [] [] [] [] | - nano | [] [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | [] | - psmisc | [] [] | - pwdutils | [] [] | - python | | - qof | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - silky | [] | - skencil | [] [] [] | - sketch | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - stardict | [] [] [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] | - tin | () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] | - xpad | [] [] [] | - +------------------------------------------------------+ - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 2 3 58 30 54 5 73 72 4 40 46 11 50 128 2 + or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + +--------------------------------------------------+ + Compendium | [] [] [] [] [] | + a2ps | () [] [] [] [] [] [] | + aegis | () () | + ant-phone | [] [] | + anubis | [] [] [] | + ap-utils | () | + aspell | [] [] [] | + bash | [] [] | + bfd | | + bibshelf | [] | + binutils | [] [] | + bison | [] [] [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] [] | + cflow | [] | + clisp | [] | + console-tools | [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + cpplib | [] | + cryptonit | [] [] | + dialog | [] | + diffutils | [] [] [] [] [] [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + fetchmail | [] [] [] | + findutils | [] [] [] | + findutils_stable | [] [] [] [] [] [] | + flex | [] [] [] [] [] | + fslint | [] | + gas | | + gawk | [] [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] [] | + gip | [] [] [] [] | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] [] | + gmult | [] [] [] [] | + gnubiff | () [] | + gnucash | () [] | + gnuedu | | + gnulib | [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] [] [] [] [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] [] [] [] [] [] | + gpe-login | [] [] [] [] [] [] [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] | + gramadoir | [] [] | + grep | [] [] [] [] | + gretl | [] [] [] | + gsasl | [] [] [] | + gss | [] [] [] [] | + gst-plugins-bad | [] [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] | + gstreamer | [] [] [] [] | + gtick | [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] [] | + herrie | [] [] [] | + hylafax | | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] | + jpilot | | + jtag | [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + latrine | | + ld | [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] | + libextractor | [] [] | + libgpewidget | [] [] [] [] [] [] [] [] | + libgpg-error | [] [] [] | + libgphoto2 | [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] | + libidn | [] [] () | + lifelines | [] [] | + lilypond | | + lingoteach | [] | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] [] [] | + make | [] [] [] [] | + man-db | [] [] [] [] | + minicom | [] [] [] [] [] | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] | + pilot-qof | | + popt | [] [] [] [] | + psmisc | [] [] | + pwdutils | [] [] | + qof | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + rpm | [] [] [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + shared-mime-info | [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] [] | + solfege | [] | + soundtracker | [] [] | + sp | | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | () | + tuxpaint | [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] | + util-linux-ng | [] [] [] [] | + vorbis-tools | [] | + wastesedge | | + wdiff | [] [] [] [] [] [] [] | + wget | [] [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu +---------------------------------------------------+ - GNUnet | [] | 2 + Compendium | [] [] [] [] | 19 a2ps | [] [] [] | 19 - aegis | | 0 + aegis | [] | 1 ant-phone | [] [] | 6 anubis | [] [] [] | 11 ap-utils | () [] | 4 - aspell | [] [] [] | 15 - bash | [] | 11 - batchelor | [] [] | 9 - bfd | | 1 + aspell | [] [] [] | 16 + bash | [] | 6 + bfd | | 2 bibshelf | [] | 7 - binutils | [] [] [] | 9 - bison | [] [] [] | 19 - bison-runtime | [] [] [] | 15 + binutils | [] [] [] [] | 9 + bison | [] [] [] [] | 20 + bison-runtime | [] [] [] [] | 18 bluez-pin | [] [] [] [] [] [] | 28 cflow | [] [] | 5 - clisp | | 6 + clisp | | 9 console-tools | [] [] | 5 - coreutils | [] [] | 16 - cpio | [] [] [] | 9 - cpplib | [] [] [] [] | 11 - cryptonit | | 5 - darkstat | [] () () | 15 - dialog | [] [] [] [] [] | 30 - diffutils | [] [] [] [] | 28 + coreutils | [] [] [] | 18 + cpio | [] [] [] [] | 11 + cpplib | [] [] [] [] [] | 12 + cryptonit | [] | 6 + dialog | [] [] [] | 9 + diffutils | [] [] [] [] [] | 29 doodle | [] | 6 e2fsprogs | [] [] | 10 enscript | [] [] [] | 16 - error | [] [] [] [] | 18 fetchmail | [] [] | 12 - fileutils | [] [] [] | 18 - findutils | [] [] [] | 17 + findutils | [] [] [] | 11 + findutils_stable | [] [] [] [] | 18 flex | [] [] | 15 - fslint | [] | 9 + fslint | [] | 2 gas | [] | 3 - gawk | [] [] | 15 - gbiff | [] | 5 + gawk | [] [] [] | 16 gcal | [] | 5 - gcc | [] [] [] | 6 - gettext-examples | [] [] [] [] [] [] | 27 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] | 29 gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 19 - gimp-print | [] [] | 12 - gip | [] [] | 12 - gliv | [] [] | 8 + gettext-tools | [] [] [] [] [] | 20 + gip | [] [] | 13 + gliv | [] [] | 11 glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 15 - gnubiff | [] | 1 - gnucash | () | 2 - gnucash-glossary | [] [] | 9 + gmult | [] [] [] [] | 16 + gnubiff | [] | 2 + gnucash | () [] | 5 gnuedu | [] | 2 - gnulib | [] [] [] [] [] | 28 - gnunet-gtk | | 1 - gnutls | | 2 + gnulib | [] | 10 + gnunet | | 0 + gnunet-gtk | [] [] | 3 + gnutls | | 4 gpe-aerial | [] [] | 14 gpe-beam | [] [] | 14 - gpe-calendar | [] | 3 + gpe-calendar | [] [] | 7 gpe-clock | [] [] [] [] | 21 - gpe-conf | [] [] | 14 + gpe-conf | [] [] [] | 16 gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] | 20 - gpe-filemanager | [] | 6 - gpe-go | [] [] | 15 + gpe-edit | [] [] [] [] [] | 22 + gpe-filemanager | [] [] | 7 + gpe-go | [] [] [] [] | 19 gpe-login | [] [] [] [] [] | 21 gpe-ownerinfo | [] [] [] [] | 21 gpe-package | [] | 6 gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] | 20 - gpe-taskmanager | [] [] [] | 20 + gpe-su | [] [] [] [] | 21 + gpe-taskmanager | [] [] [] [] | 21 gpe-timesheet | [] [] [] [] | 18 gpe-today | [] [] [] [] [] | 21 - gpe-todo | [] | 7 - gphoto2 | [] [] [] [] | 20 - gprof | [] [] | 11 - gpsdrive | | 4 + gpe-todo | [] [] | 8 + gphoto2 | [] [] [] [] | 21 + gprof | [] [] | 13 + gpsdrive | [] | 5 gramadoir | [] | 7 - grep | [] [] [] [] | 34 - gretl | | 4 - gsasl | [] [] | 8 - gss | [] | 5 - gst-plugins | [] [] [] | 15 - gst-plugins-base | [] [] [] | 9 - gst-plugins-good | [] [] [] [] [] | 20 - gstreamer | [] [] [] | 17 - gtick | [] | 3 - gtkam | [] | 13 + grep | [] | 12 + gretl | | 6 + gsasl | [] [] [] | 9 + gss | [] | 7 + gst-plugins-bad | [] [] [] | 13 + gst-plugins-base | [] [] | 11 + gst-plugins-good | [] [] [] [] [] | 16 + gst-plugins-ugly | [] [] [] | 13 + gstreamer | [] [] [] | 18 + gtick | [] [] | 7 + gtkam | [] | 16 gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 26 - gutenprint | | 3 - hello | [] [] [] [] [] | 37 - id-utils | [] [] | 14 - impost | [] | 4 - indent | [] [] [] [] | 25 - iso_3166 | [] [] [] [] | 16 - iso_3166_2 | | 2 - iso_4217 | [] [] | 14 - iso_639 | [] | 14 + gtkspell | [] [] [] [] [] [] | 27 + gutenprint | | 4 + hello | [] [] [] [] [] | 38 + herrie | [] [] | 8 + hylafax | | 0 + idutils | [] [] | 15 + indent | [] [] [] [] [] | 28 + iso_15924 | [] [] | 4 + iso_3166 | [] [] [] [] [] [] [] [] [] | 54 + iso_3166_2 | [] [] | 4 + iso_4217 | [] [] [] [] [] | 24 + iso_639 | [] [] [] [] [] | 26 jpilot | [] [] [] [] | 7 jtag | [] | 3 jwhois | [] [] [] | 13 - kbd | [] [] | 12 - keytouch | [] | 4 - keytouch-editor | | 2 - keytouch-keyboa... | [] | 3 - latrine | [] [] | 8 - ld | [] [] [] [] | 8 - leafpad | [] [] [] [] | 23 - libc | [] [] [] | 23 - libexif | [] | 4 + kbd | [] [] [] | 13 + keytouch | [] | 8 + keytouch-editor | [] | 5 + keytouch-keyboa... | [] | 5 + latrine | [] [] | 5 + ld | [] [] [] [] | 10 + leafpad | [] [] [] [] [] | 24 + libc | [] [] [] | 19 + libexif | [] | 5 libextractor | [] | 5 - libgpewidget | [] [] [] | 19 - libgpg-error | [] | 4 - libgphoto2 | [] | 8 + libgpewidget | [] [] [] | 20 + libgpg-error | [] | 6 + libgphoto2 | [] [] | 9 libgphoto2_port | [] [] [] | 11 libgsasl | [] | 8 - libiconv | [] | 7 - libidn | [] [] | 10 + libiconv | [] [] | 11 + libidn | [] [] | 11 lifelines | | 4 - lilypond | | 2 + lilypond | [] | 6 lingoteach | [] | 6 + lprng | [] | 2 lynx | [] [] [] | 15 m4 | [] [] [] | 18 - mailutils | [] | 8 + mailfromd | [] [] | 3 + mailutils | [] [] | 8 make | [] [] [] | 20 - man-db | [] | 6 + man-db | [] | 9 minicom | [] | 14 - mysecretdiary | [] [] | 12 - nano | [] [] | 17 - nano_1_0 | [] [] [] | 18 + nano | [] [] [] | 20 opcodes | [] [] | 10 - parted | [] [] [] | 10 - pilot-qof | [] | 3 - psmisc | [] | 10 + parted | [] [] [] | 11 + pilot-qof | [] | 1 + popt | [] [] [] [] | 18 + psmisc | [] [] | 10 pwdutils | [] | 3 - python | | 0 qof | [] | 4 - radius | [] | 6 + radius | [] [] | 7 recode | [] [] [] | 25 - rpm | [] [] [] [] | 14 + rpm | [] [] [] [] | 13 screem | [] | 2 scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] | 22 - sh-utils | [] | 15 - shared-mime-info | [] [] [] [] | 24 + sed | [] [] [] [] | 23 + shared-mime-info | [] [] [] | 29 sharutils | [] [] [] | 23 - shishi | | 1 - silky | [] | 4 + shishi | [] | 3 skencil | [] | 7 - sketch | | 6 - solfege | | 2 + solfege | [] | 3 soundtracker | [] [] | 9 sp | [] | 3 - stardict | [] [] [] [] | 11 - system-tools-ba... | [] [] [] [] [] [] [] | 37 - tar | [] [] [] [] | 20 + system-tools-ba... | [] [] [] [] [] [] [] | 38 + tar | [] [] [] | 17 texinfo | [] [] [] | 15 - textutils | [] [] [] | 17 tin | | 1 - tp-robot | [] [] [] | 10 - tuxpaint | [] [] [] | 16 + tuxpaint | [] [] [] | 19 unicode-han-tra... | | 0 unicode-transla... | | 2 util-linux | [] [] [] | 20 - vorbis-tools | [] [] | 11 + util-linux-ng | [] [] [] | 20 + vorbis-tools | [] [] | 4 wastesedge | | 1 - wdiff | [] [] | 22 - wget | [] [] [] | 19 + wdiff | [] [] | 23 + wget | [] [] [] | 20 xchat | [] [] [] [] | 29 - xkeyboard-config | [] [] [] [] | 11 - xpad | [] [] [] | 14 + xkeyboard-config | [] [] [] | 14 + xpad | [] [] [] | 15 +---------------------------------------------------+ - 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 170 domains 0 1 1 77 39 0 136 10 1 48 5 54 0 2028 + 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -1075,10 +1042,10 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If October 2006 seems to be old, you may fetch a more recent copy of -this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date -matrix with full percentage details can be found at -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. + If November 2007 seems to be old, you may fetch a more recent copy +of this `ABOUT-NLS' file on most GNU archive sites. The most +up-to-date matrix with full percentage details can be found at +`http://translationproject.org/extra/matrix.html'. 1.6 Using `gettext' in new packages =================================== @@ -1096,6 +1063,6 @@ the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact -`translation@iro.umontreal.ca' to make the `.pot' files available to -the translation teams. +`coordinator@translationproject.org' to make the `.pot' files available +to the translation teams. diff --git a/gettext-tools/doc/gettext.info b/gettext-tools/doc/gettext.info index 838b47350..7333578bd 100644 --- a/gettext-tools/doc/gettext.info +++ b/gettext-tools/doc/gettext.info @@ -1,8 +1,7 @@ -This is gettext.info, produced by makeinfo version 4.8 from -gettext.texi. - INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY +This is gettext.info, produced by makeinfo version 4.11 from gettext.texi. + * gettext: (gettext). GNU gettext utilities. * autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. * envsubst: (gettext)envsubst Invocation. Expand environment variables. @@ -30,7 +29,7 @@ END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It also serves as a reference for the free Translation Project. - Copyright (C) 1995-1998, 2001-2006 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2001-2007 Free Software Foundation, Inc. This manual is free documentation. It is dually licensed under the GNU FDL and the GNU GPL. This means that you can redistribute this @@ -42,13 +41,13 @@ Free Documentation License (FDL), either version 1.2 of the License, or (at your option) any later version published by the Free Software Foundation (FSF); with no Invariant Sections, with no Front-Cover Text, and with no Back-Cover Texts. A copy of the license is included in -*Note GNU FDL::. +*note GNU FDL::. This manual is covered by the GNU GPL. You can redistribute it and/or modify it under the terms of the GNU General Public License (GPL), either version 2 of the License, or (at your option) any later version published by the Free Software Foundation (FSF). A copy of the -license is included in *Note GNU GPL::. +license is included in *note GNU GPL::.  File: gettext.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) @@ -56,8 +55,8 @@ File: gettext.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) GNU `gettext' utilities *********************** -This manual documents the GNU gettext tools and the GNU libintl library, -version 0.16. + This manual documents the GNU gettext tools and the GNU libintl +library, version 0.17. * Menu: @@ -101,8 +100,16 @@ Introduction The User's View -* Matrix:: The Current `ABOUT-NLS' Matrix -* End Users:: Magic for End Users +* System Installation:: Questions During Operating System Installation +* Setting the GUI Locale:: How to Specify the Locale Used by GUI Programs +* Setting the POSIX Locale:: How to Specify the Locale According to POSIX +* Installing Localizations:: How to Install Additional Translations + +Setting the POSIX Locale + +* Locale Names:: How a Locale Specification Looks Like +* Locale Environment Variables:: Which Environment Variable Specfies What +* The LANGUAGE variable:: How to Specify a Priority List of Languages Preparing Program Sources @@ -113,6 +120,7 @@ Preparing Program Sources * Marking:: Marking Translatable Strings * c-format Flag:: Telling something about the following string * Special cases:: Special Cases of Translatable Strings +* Bug Report Address:: Letting Users Report Translation Bugs * Names:: Marking Proper Names for Translation * Libraries:: Preparing Library Sources @@ -134,6 +142,7 @@ Editing PO Files * KBabel:: KDE's PO File Editor * Gtranslator:: GNOME's PO File Editor * PO Mode:: Emacs's PO File Editor +* Compendium:: Using Translation Compendia Emacs's PO File Editor @@ -150,7 +159,6 @@ Emacs's PO File Editor * Subedit:: Mode for Editing Translations * C Sources Context:: C Sources Context * Auxiliary:: Consulting Auxiliary PO Files -* Compendium:: Using Translation Compendia Using Translation Compendia @@ -169,8 +177,17 @@ Manipulating PO Files * msgattrib Invocation:: Invoking the `msgattrib' Program * msgen Invocation:: Invoking the `msgen' Program * msgexec Invocation:: Invoking the `msgexec' Program +* Colorizing:: Highlighting parts of PO files * libgettextpo:: Writing your own programs that process PO files +Highlighting parts of PO files + +* The --color option:: Triggering colorized output +* The TERM variable:: The environment variable `TERM' +* The --style option:: The `--style' option +* Style rules:: Style rules for PO files +* Customizing less:: Customizing `less' for viewing PO files + Producing Binary MO Files * msgfmt Invocation:: Invoking the `msgfmt' Program @@ -234,7 +251,7 @@ The Maintainer's View * Prerequisites:: Prerequisite Works * gettextize Invocation:: Invoking the `gettextize' Program * Adjusting Files:: Files You Must Create or Alter -* autoconf macros:: Autoconf macros for use in `configure.in' +* autoconf macros:: Autoconf macros for use in `configure.ac' * CVS Issues:: Integrating with CVS * Release Management:: Creating a Distribution Tarball @@ -244,7 +261,7 @@ Files You Must Create or Alter * po/LINGUAS:: `LINGUAS' in `po/' * po/Makevars:: `Makevars' in `po/' * po/Rules-*:: Extending `Makefile' in `po/' -* configure.in:: `configure.in' at top level +* configure.ac:: `configure.ac' at top level * config.guess:: `config.guess', `config.sub' at top level * mkinstalldirs:: `mkinstalldirs' at top level * aclocal:: `aclocal.m4' at top level @@ -254,7 +271,7 @@ Files You Must Create or Alter * src/Makefile:: `Makefile.in' in `src/' * lib/gettext.h:: `gettext.h' in `lib/' -Autoconf macros for use in `configure.in' +Autoconf macros for use in `configure.ac' * AM_GNU_GETTEXT:: AM_GNU_GETTEXT in `gettext.m4' * AM_GNU_GETTEXT_VERSION:: AM_GNU_GETTEXT_VERSION in `gettext.m4' @@ -299,6 +316,7 @@ The Translator's View * php-format:: PHP Format Strings * gcc-internal-format:: GCC internal Format Strings * qt-format:: Qt Format Strings +* kde-format:: KDE Format Strings * boost-format:: Boost Format Strings Individual Programming Languages @@ -375,9 +393,9 @@ File: gettext.info, Node: Introduction, Next: Users, Prev: Top, Up: Top 1 Introduction ************** -This chapter explains the goals sought in the creation of GNU `gettext' -and the free Translation Project. Then, it explains a few broad -concepts around Native Language Support, and positions message + This chapter explains the goals sought in the creation of GNU +`gettext' and the free Translation Project. Then, it explains a few +broad concepts around Native Language Support, and positions message translation with regard to other aspects of national and cultural variance, as they apply to programs. It also surveys those files used to convey the translations. It explains how the various tools interact @@ -415,9 +433,9 @@ File: gettext.info, Node: Why, Next: Concepts, Prev: Introduction, Up: Intro 1.1 The Purpose of GNU `gettext' ================================ -Usually, programs are written and documented in English, and use + Usually, programs are written and documented in English, and use English at execution time to interact with users. This is true not -only of GNU software, but also of a great deal of commercial and free +only of GNU software, but also of a great deal of proprietary and free software. Using a common language is quite handy for communication between developers, maintainers and users from all countries. On the other hand, most people are less comfortable with English than with @@ -487,7 +505,7 @@ File: gettext.info, Node: Concepts, Next: Aspects, Prev: Why, Up: Introducti 1.2 I18n, L10n, and Such ======================== -Two long words appear all the time when we discuss support of native + Two long words appear all the time when we discuss support of native language in programs, and these words have a precise meaning, worth being explained here, once and for all in this document. The words are _internationalization_ and _localization_. Many people, tired of @@ -549,7 +567,7 @@ File: gettext.info, Node: Aspects, Next: Files, Prev: Concepts, Up: Introduc 1.3 Aspects in Native Language Support ====================================== -For a totally multi-lingual distribution, there are many things to + For a totally multi-lingual distribution, there are many things to translate beyond output messages. * As of today, GNU `gettext' offers a complete toolset for @@ -657,10 +675,22 @@ _Messages_ communicate to the user. + These areas of cultural conventions are called _locale categories_. +It is an unfortunate term; _locale aspects_ or _locale feature +categories_ would be a better term, because each "locale category" +describes an area or task that requires localization. The concrete data +that describes the cultural conventions for such an area and for a +particular culture is also called a _locale category_. In this sense, +a locale is composed of several locale categories: the locale category +describing the codeset, the locale category describing the formatting +of numbers, the locale category containing the translated messages, and +so on. + Components of locale outside of message handling are standardized in -the ISO C standard and the SUSV2 specification. GNU `libc' fully -implements this, and most other modern systems provide a more or less -reasonable support for at least some of the missing components. +the ISO C standard and the POSIX:2001 standard (also known as the SUSV3 +specification). GNU `libc' fully implements this, and most other +modern systems provide a more or less reasonable support for at least +some of the missing components.  File: gettext.info, Node: Files, Next: Overview, Prev: Aspects, Up: Introduction @@ -668,11 +698,11 @@ File: gettext.info, Node: Files, Next: Overview, Prev: Aspects, Up: Introduc 1.4 Files Conveying Translations ================================ -The letters PO in `.po' files means Portable Object, to distinguish it -from `.mo' files, where MO stands for Machine Object. This paradigm, -as well as the PO file format, is inspired by the NLS standard -developed by Uniforum, and first implemented by Sun in their Solaris -system. + The letters PO in `.po' files means Portable Object, to distinguish +it from `.mo' files, where MO stands for Machine Object. This +paradigm, as well as the PO file format, is inspired by the NLS +standard developed by Uniforum, and first implemented by Sun in their +Solaris system. PO files are meant to be read and edited by humans, and associate each original, translatable string of a given package with its @@ -704,10 +734,10 @@ File: gettext.info, Node: Overview, Prev: Files, Up: Introduction 1.5 Overview of GNU `gettext' ============================= -The following diagram summarizes the relation between the files handled -by GNU `gettext' and the tools acting on these files. It is followed -by somewhat detailed explanations, which you should read while keeping -an eye on the diagram. Having a clear understanding of these + The following diagram summarizes the relation between the files +handled by GNU `gettext' and the tools acting on these files. It is +followed by somewhat detailed explanations, which you should read while +keeping an eye on the diagram. Having a clear understanding of these interrelations will surely help programmers, translators and maintainers. @@ -775,12 +805,12 @@ towards any particular language. *Note xgettext Invocation::, for more details about how one calls the `xgettext' program. If you are _really_ lazy, you might be interested at working a lot more right away, and preparing the whole distribution setup (*note Maintainers::). -By doing so, you spare yourself typing the `xgettext' command, as -`make' should now generate the proper things automatically for you! +By doing so, you spare yourself typing the `xgettext' command, as `make' +should now generate the proper things automatically for you! The first time through, there is no `LANG.po' yet, so the `msgmerge' step may be skipped and replaced by a mere copy of `PACKAGE.pot' to -`LANG.po', where LANG represents the target language. See *Note +`LANG.po', where LANG represents the target language. See *note Creating:: for details. Then comes the initial translation of messages. Translation in @@ -874,8 +904,9 @@ with the GNU `gettext' library, usually through the operation of `make', given a suitable `Makefile' exists for the project, and the resulting executable is installed somewhere users will find it. The MO files themselves should also be properly installed. Given the -appropriate environment variables are set (*note End Users::), the -program should localize itself automatically, whenever it executes. +appropriate environment variables are set (*note Setting the POSIX +Locale::), the program should localize itself automatically, whenever +it executes. The remainder of this manual has the purpose of explaining in depth the various steps outlined above. @@ -886,71 +917,268 @@ File: gettext.info, Node: Users, Next: PO Files, Prev: Introduction, Up: Top 2 The User's View ***************** -When GNU `gettext' will truly have reached its goal, average users -should feel some kind of astonished pleasure, seeing the effect of that -strange kind of magic that just makes their own native language appear -everywhere on their screens. As for naive users, they would ideally -have no special pleasure about it, merely taking their own language for -_granted_, and becoming rather unhappy otherwise. - - So, let's try to describe here how we would like the magic to -operate, as we want the users' view to be the simplest, among all ways -one could look at GNU `gettext'. All other software engineers: -programmers, translators, maintainers, should work together in such a -way that the magic becomes possible. This is a long and progressive -undertaking, and information is available about the progress of the -Translation Project. - - When a package is distributed, there are two kinds of users: -"installers" who fetch the distribution, unpack it, configure it, -compile it and install it for themselves or others to use; and "end -users" that call programs of the package, once these have been -installed at their site. GNU `gettext' is offering magic for both -installers and end users. + Nowadays, when users log into a computer, they usually find that all +their programs show messages in their native language - at least for +users of languages with an active free software community, like French +or German; to a lesser extent for languages with a smaller +participation in free software and the GNU project, like Hindi and +Filipino. + + How does this work? How can the user influence the language that is +used by the programs? This chapter will answer it. * Menu: -* Matrix:: The Current `ABOUT-NLS' Matrix -* End Users:: Magic for End Users +* System Installation:: Questions During Operating System Installation +* Setting the GUI Locale:: How to Specify the Locale Used by GUI Programs +* Setting the POSIX Locale:: How to Specify the Locale According to POSIX +* Installing Localizations:: How to Install Additional Translations  -File: gettext.info, Node: Matrix, Next: End Users, Prev: Users, Up: Users +File: gettext.info, Node: System Installation, Next: Setting the GUI Locale, Prev: Users, Up: Users -2.1 The Current `ABOUT-NLS' Matrix -================================== +2.1 Operating System Installation +================================= -Languages are not equally supported in all packages using GNU -`gettext'. To know if some package uses GNU `gettext', one may check -the distribution for the `ABOUT-NLS' information file, for some `LL.po' -files, often kept together into some `po/' directory, or for an `intl/' -directory. Internationalized packages have usually many `LL.po' files, -where LL represents the language. *Note End Users:: for a complete -description of the format for LL. - - More generally, a matrix is available for showing the current state -of the Translation Project, listing which packages are prepared for -multi-lingual messages, and which languages are supported by each. -Because this information changes often, this matrix is not kept within -this GNU `gettext' manual. This information is often found in file -`ABOUT-NLS' from various distributions, but is also as old as the -distribution itself. A recent copy of this `ABOUT-NLS' file, -containing up-to-date information, should generally be found on the -Translation Project sites, and also on most GNU archive sites. + The default language is often already specified during operating +system installation. When the operating system is installed, the +installer typically asks for the language used for the installation +process and, separately, for the language to use in the installed +system. Some OS installers only ask for the language once. + + This determines the system-wide default language for all users. But +the installers often give the possibility to install extra +localizations for additional languages. For example, the localizations +of KDE (the K Desktop Environment) and OpenOffice.org are often bundled +separately, as one installable package per language. + + At this point it is good to consider the intended use of the +machine: If it is a machine designated for personal use, additional +localizations are probably not necessary. If, however, the machine is +in use in an organization or company that has international +relationships, one can consider the needs of guest users. If you have +a guest from abroad, for a week, what could be his preferred locales? +It may be worth installing these additional localizations ahead of +time, since they cost only a bit of disk space at this point. + + The system-wide default language is the locale configuration that is +used when a new user account is created. But the user can have his own +locale configuration that is different from the one of the other users +of the same machine. He can specify it, typically after the first +login, as described in the next section.  -File: gettext.info, Node: End Users, Prev: Matrix, Up: Users +File: gettext.info, Node: Setting the GUI Locale, Next: Setting the POSIX Locale, Prev: System Installation, Up: Users -2.2 Magic for End Users -======================= +2.2 Setting the Locale Used by GUI Programs +=========================================== + + The immediately available programs in a user's desktop come from a +group of programs called a "desktop environment"; it usually includes +the window manager, a web browser, a text editor, and more. The most +common free desktop environments are KDE, GNOME, and Xfce. + + The locale used by GUI programs of the desktop environment can be +specified in a configuration screen called "control center", "language +settings" or "country settings". + + Individual GUI programs that are not part of the desktop environment +can have their locale specified either in a settings panel, or through +environment variables. + + For some programs, it is possible to specify the locale through +environment variables, possibly even to a different locale than the +desktop's locale. This means, instead of starting a program through a +menu or from the file system, you can start it from the command-line, +after having set some environment variables. The environment variables +can be those specified in the next section (*note Setting the POSIX +Locale::); for some versions of KDE, however, the locale is specified +through a variable `KDE_LANG', rather than `LANG' or `LC_ALL'. + + +File: gettext.info, Node: Setting the POSIX Locale, Next: Installing Localizations, Prev: Setting the GUI Locale, Up: Users + +2.3 Setting the Locale through Environment Variables +==================================================== + + As a user, if your language has been installed for this package, in +the simplest case, you only have to set the `LANG' environment variable +to the appropriate `LL_CC' combination. For example, let's suppose +that you speak German and live in Germany. At the shell prompt, merely +execute `setenv LANG de_DE' (in `csh'), `export LANG; LANG=de_DE' (in +`sh') or `export LANG=de_DE' (in `bash'). This can be done from your +`.login' or `.profile' file, once and for all. + +* Menu: + +* Locale Names:: How a Locale Specification Looks Like +* Locale Environment Variables:: Which Environment Variable Specfies What +* The LANGUAGE variable:: How to Specify a Priority List of Languages + + +File: gettext.info, Node: Locale Names, Next: Locale Environment Variables, Prev: Setting the POSIX Locale, Up: Setting the POSIX Locale + +2.3.1 Locale Names +------------------ + + A locale name usually has the form `LL_CC'. Here `LL' is an ISO 639 +two-letter language code, and `CC' is an ISO 3166 two-letter country +code. For example, for German in Germany, LL is `de', and CC is `DE'. +You find a list of the language codes in appendix *note Language +Codes:: and a list of the country codes in appendix *note Country +Codes::. + + You might think that the country code specification is redundant. +But in fact, some languages have dialects in different countries. For +example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The +country code serves to distinguish the dialects. + + Many locale names have an extended syntax `LL_CC.ENCODING' that also +specifies the character encoding. These are in use because between +2000 and 2005, most users have switched to locales in UTF-8 encoding. +For example, the German locale on glibc systems is nowadays +`de_DE.UTF-8'. The older name `de_DE' still refers to the German +locale as of 2000 that stores characters in ISO-8859-1 encoding - a +text encoding that cannot even accomodate the Euro currency sign. + + Some locale names use `LL_CC.@VARIANT' instead of `LL_CC'. The +`@VARIANT' can denote any kind of characteristics that is not already +implied by the language LL and the country CC. It can denote a +particular monetary unit. For example, on glibc systems, `de_DE@euro' +denotes the locale that uses the Euro currency, in contrast to the +older locale `de_DE' which implies the use of the currency before 2002. +It can also denote a dialect of the language, or the script used to +write text (for example, `sr_RS@latin' uses the Latin script, whereas +`sr_RS' uses the Cyrillic script to write Serbian), or the orthography +rules, or similar. + + On other systems, some variations of this scheme are used, such as +`LL'. You can get the list of locales supported by your system for +your language by running the command `locale -a | grep '^LL''. + + There is also a special locale, called `C'. When it is used, it +disables all localization: in this locale, all programs standardized by +POSIX use English messages and an unspecified character encoding (often +US-ASCII, but sometimes also ISO-8859-1 or UTF-8, depending on the +operating system). + + +File: gettext.info, Node: Locale Environment Variables, Next: The LANGUAGE variable, Prev: Locale Names, Up: Setting the POSIX Locale -We consider here those packages using GNU `gettext' internally, and for -which the installers did not disable translation at _configure_ time. -Then, users only have to set the `LANG' environment variable to the -appropriate `LL_CC' combination prior to using the programs in the -package. *Note Matrix::. For example, let's presume a German site. -At the shell prompt, users merely have to execute `setenv LANG de_DE' -(in `csh') or `export LANG; LANG=de_DE' (in `sh'). They could even do -this from their `.login' or `.profile' file. +2.3.2 Locale Environment Variables +---------------------------------- + + A locale is composed of several _locale categories_, see *note +Aspects::. When a program looks up locale dependent values, it does +this according to the following environment variables, in priority +order: + + 1. `LANGUAGE' + + 2. `LC_ALL' + + 3. `LC_xxx', according to selected locale category: `LC_CTYPE', + `LC_NUMERIC', `LC_TIME', `LC_COLLATE', `LC_MONETARY', + `LC_MESSAGES', ... + + 4. `LANG' + + Variables whose value is set but is empty are ignored in this lookup. + + `LANG' is the normal environment variable for specifying a locale. +As a user, you normally set this variable (unless some of the other +variables have already been set by the system, in `/etc/profile' or +similar initialization files). + + `LC_CTYPE', `LC_NUMERIC', `LC_TIME', `LC_COLLATE', `LC_MONETARY', +`LC_MESSAGES', and so on, are the environment variables meant to +override `LANG' and affecting a single locale category only. For +example, assume you are a Swedish user in Spain, and you want your +programs to handle numbers and dates according to Spanish conventions, +and only the messages should be in Swedish. Then you could create a +locale named `sv_ES' or `sv_ES.UTF-8' by use of the `localedef' +program. But it is simpler, and achieves the same effect, to set the +`LANG' variable to `es_ES.UTF-8' and the `LC_MESSAGES' variable to +`sv_SE.UTF-8'; these two locales come already preinstalled with the +operating system. + + `LC_ALL' is an environment variable that overrides all of these. It +is typically used in scripts that run particular programs. For example, +`configure' scripts generated by GNU autoconf use `LC_ALL' to make sure +that the configuration tests don't operate in locale dependent ways. + + Some systems, unfortunately, set `LC_ALL' in `/etc/profile' or in +similar initialization files. As a user, you therefore have to unset +this variable if you want to set `LANG' and optionally some of the other +`LC_xxx' variables. + + The `LANGUAGE' variable is described in the next subsection. + + +File: gettext.info, Node: The LANGUAGE variable, Prev: Locale Environment Variables, Up: Setting the POSIX Locale + +2.3.3 Specifying a Priority List of Languages +--------------------------------------------- + + Not all programs have translations for all languages. By default, an +English message is shown in place of a nonexistent translation. If you +understand other languages, you can set up a priority list of languages. +This is done through a different environment variable, called +`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LC_ALL' +and `LANG' for the purpose of message handling, but you still need to +have `LANG' (or `LC_ALL') set to the primary language; this is required +by other parts of the system libraries. For example, some Swedish +users who would rather read translations in German than English for +when Swedish is not available, set `LANGUAGE' to `sv:de' while leaving +`LANG' to `sv_SE'. + + Special advice for Norwegian users: The language code for Norwegian +bokma*l changed from `no' to `nb' recently (in 2003). During the +transition period, while some message catalogs for this language are +installed under `nb' and some older ones under `no', it is recommended +for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and +older translations are used. + + In the `LANGUAGE' environment variable, but not in the other +environment variables, `LL_CC' combinations can be abbreviated as `LL' +to denote the language's main dialect. For example, `de' is equivalent +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' +(Portuguese as spoken in Portugal) in this context. + + Note: The variable `LANGUAGE' is ignored if the locale is set to +`C'. In other words, you have to first enable localization, by setting +`LANG' (or `LC_ALL') to a value other than `C', before you can use a +language priority list through the `LANGUAGE' variable. + + +File: gettext.info, Node: Installing Localizations, Prev: Setting the POSIX Locale, Up: Users + +2.4 Installing Translations for Particular Programs +=================================================== + + Languages are not equally well supported in all packages using GNU +`gettext', and more translations are added over time. Usually, you use +the translations that are shipped with the operating system or with +particular packages that you install afterwards. But you can also +install newer localizations directly. For doing this, you will need an +understanding where each localization file is stored on the file system. + + For programs that participate in the Translation Project, you can +start looking for translations here: +`http://translationproject.org/team/index.html'. A snapshot of this +information is also found in the `ABOUT-NLS' file that is shipped with +GNU gettext. + + For programs that are part of the KDE project, the starting point is: +`http://i18n.kde.org/'. + + For programs that are part of the GNOME project, the starting point +is: `http://www.gnome.org/i18n/'. + + For other programs, you may check whether the program's source code +package contains some `LL.po' files; often they are kept together in a +directory called `po/'. Each `LL.po' file contains the message +translations for the language whose abbreviation of LL.  File: gettext.info, Node: PO Files, Next: Sources, Prev: Users, Up: Top @@ -958,7 +1186,7 @@ File: gettext.info, Node: PO Files, Next: Sources, Prev: Users, Up: Top 3 The Format of PO Files ************************ -The GNU `gettext' toolset helps programmers and translators at + The GNU `gettext' toolset helps programmers and translators at producing, updating and using translation files, mainly those PO files which are textual, editable files. This chapter explains the format of PO files. @@ -1057,88 +1285,92 @@ forms of flags defined: In case the `c-format' flag is given for a string the `msgfmt' does some more tests to check to validity of the translation. - *Note msgfmt Invocation::, *Note c-format Flag:: and *Note + *Note msgfmt Invocation::, *note c-format Flag:: and *note c-format::. `objc-format' `no-objc-format' - Likewise for Objective C, see *Note objc-format::. + Likewise for Objective C, see *note objc-format::. `sh-format' `no-sh-format' - Likewise for Shell, see *Note sh-format::. + Likewise for Shell, see *note sh-format::. `python-format' `no-python-format' - Likewise for Python, see *Note python-format::. + Likewise for Python, see *note python-format::. `lisp-format' `no-lisp-format' - Likewise for Lisp, see *Note lisp-format::. + Likewise for Lisp, see *note lisp-format::. `elisp-format' `no-elisp-format' - Likewise for Emacs Lisp, see *Note elisp-format::. + Likewise for Emacs Lisp, see *note elisp-format::. `librep-format' `no-librep-format' - Likewise for librep, see *Note librep-format::. + Likewise for librep, see *note librep-format::. `scheme-format' `no-scheme-format' - Likewise for Scheme, see *Note scheme-format::. + Likewise for Scheme, see *note scheme-format::. `smalltalk-format' `no-smalltalk-format' - Likewise for Smalltalk, see *Note smalltalk-format::. + Likewise for Smalltalk, see *note smalltalk-format::. `java-format' `no-java-format' - Likewise for Java, see *Note java-format::. + Likewise for Java, see *note java-format::. `csharp-format' `no-csharp-format' - Likewise for C#, see *Note csharp-format::. + Likewise for C#, see *note csharp-format::. `awk-format' `no-awk-format' - Likewise for awk, see *Note awk-format::. + Likewise for awk, see *note awk-format::. `object-pascal-format' `no-object-pascal-format' - Likewise for Object Pascal, see *Note object-pascal-format::. + Likewise for Object Pascal, see *note object-pascal-format::. `ycp-format' `no-ycp-format' - Likewise for YCP, see *Note ycp-format::. + Likewise for YCP, see *note ycp-format::. `tcl-format' `no-tcl-format' - Likewise for Tcl, see *Note tcl-format::. + Likewise for Tcl, see *note tcl-format::. `perl-format' `no-perl-format' - Likewise for Perl, see *Note perl-format::. + Likewise for Perl, see *note perl-format::. `perl-brace-format' `no-perl-brace-format' - Likewise for Perl brace, see *Note perl-format::. + Likewise for Perl brace, see *note perl-format::. `php-format' `no-php-format' - Likewise for PHP, see *Note php-format::. + Likewise for PHP, see *note php-format::. `gcc-internal-format' `no-gcc-internal-format' - Likewise for the GCC sources, see *Note gcc-internal-format::. + Likewise for the GCC sources, see *note gcc-internal-format::. `qt-format' `no-qt-format' - Likewise for Qt, see *Note qt-format::. + Likewise for Qt, see *note qt-format::. + +`kde-format' +`no-kde-format' + Likewise for KDE, see *note kde-format::. `boost-format' `no-boost-format' - Likewise for Boost, see *Note boost-format::. + Likewise for Boost, see *note boost-format::. It is also possible to have entries with a context specifier. They @@ -1255,7 +1487,7 @@ File: gettext.info, Node: Sources, Next: Template, Prev: PO Files, Up: Top 4 Preparing Program Sources *************************** -For the programmer, changes to the C source code fall into three + For the programmer, changes to the C source code fall into three categories. First, you have to make the localization functions known to all modules needing message translation. Second, you should properly trigger the operation of GNU `gettext' when the program @@ -1272,6 +1504,7 @@ translation. * Marking:: Marking Translatable Strings * c-format Flag:: Telling something about the following string * Special cases:: Special Cases of Translatable Strings +* Bug Report Address:: Letting Users Report Translation Bugs * Names:: Marking Proper Names for Translation * Libraries:: Preparing Library Sources @@ -1281,10 +1514,10 @@ File: gettext.info, Node: Importing, Next: Triggering, Prev: Sources, Up: So 4.1 Importing the `gettext' declaration ======================================= -Presuming that your set of programs, or package, has been adjusted so -all needed GNU `gettext' files are available, and your `Makefile' files -are adjusted (*note Maintainers::), each C module having translated C -strings should contain the line: + Presuming that your set of programs, or package, has been adjusted +so all needed GNU `gettext' files are available, and your `Makefile' +files are adjusted (*note Maintainers::), each C module having +translated C strings should contain the line: #include @@ -1300,8 +1533,8 @@ File: gettext.info, Node: Triggering, Next: Preparing Strings, Prev: Importin 4.2 Triggering `gettext' Operations =================================== -The initialization of locale data should be done with more or less the -same code in every program, as demonstrated below: + The initialization of locale data should be done with more or less +the same code in every program, as demonstrated below: int main (int argc, char *argv[]) @@ -1318,23 +1551,24 @@ the Makefile. For now consult the `gettext' or `hello' sources for more information. The use of `LC_ALL' might not be appropriate for you. `LC_ALL' -includes all locale categories and especially `LC_CTYPE'. This later +includes all locale categories and especially `LC_CTYPE'. This latter category is responsible for determining character classes with the `isalnum' etc. functions from `ctype.h' which could especially for programs, which process some kind of input language, be wrong. For -example this would mean that a source code using the c, (c-cedilla +example this would mean that a source code using the ç (c-cedilla character) is runnable in France but not in the U.S. Some systems also have problems with parsing numbers using the -`scanf' functions if an other but the `LC_ALL' locale is used. The -standards say that additional formats but the one known in the `"C"' -locale might be recognized. But some systems seem to reject numbers in -the `"C"' locale format. In some situation, it might also be a problem -with the notation itself which makes it impossible to recognize whether -the number is in the `"C"' locale or the local format. This can happen -if thousands separator characters are used. Some locales define this -character according to the national conventions to `'.'' which is the -same character used in the `"C"' locale to denote the decimal point. +`scanf' functions if an other but the `LC_ALL' locale category is used. +The standards say that additional formats but the one known in the +`"C"' locale might be recognized. But some systems seem to reject +numbers in the `"C"' locale format. In some situation, it might also +be a problem with the notation itself which makes it impossible to +recognize whether the number is in the `"C"' locale or the local +format. This can happen if thousands separator characters are used. +Some locales define this character according to the national +conventions to `'.'' which is the same character used in the `"C"' +locale to denote the decimal point. So it is sometimes necessary to replace the `LC_ALL' line in the code above by a sequence of `setlocale' lines @@ -1350,14 +1584,15 @@ On all POSIX conformant systems the locale categories `LC_CTYPE', `LC_MESSAGES', `LC_COLLATE', `LC_MONETARY', `LC_NUMERIC', and `LC_TIME' are available. On some systems which are only ISO C compliant, `LC_MESSAGES' is missing, but a substitute for it is defined in GNU -gettext's `'. +gettext's `' and in GNU gnulib's `'. Note that changing the `LC_CTYPE' also affects the functions -declared in the `' standard header. If this is not desirable -in your application (for example in a compiler's parser), you can use a -set of substitute functions which hardwire the C locale, such as found -in the `' and `' files in the gettext source -distribution. +declared in the `' standard header and some functions declared +in the `' and `' standard headers. If this is not +desirable in your application (for example in a compiler's parser), you +can use a set of substitute functions which hardwire the C locale, such +as found in the modules `c-ctype', `c-strcase', `c-strcasestr', +`c-strtod', `c-strtold' in the GNU gnulib source distribution. It is also possible to switch the locale forth and back between the environment dependent locale and the C locale, but this approach is @@ -1372,7 +1607,7 @@ File: gettext.info, Node: Preparing Strings, Next: Mark Keywords, Prev: Trigg 4.3 Preparing Translatable Strings ================================== -Before strings can be marked for translations, they sometimes need to + Before strings can be marked for translations, they sometimes need to be adjusted. Usually preparing a string for translation is done right before marking it, during the marking phase which is described in the next sections. What you have to keep in mind while doing that is the @@ -1586,7 +1821,7 @@ File: gettext.info, Node: Mark Keywords, Next: Marking, Prev: Preparing Strin 4.4 How Marks Appear in Sources =============================== -All strings requiring translation should be marked in the C sources. + All strings requiring translation should be marked in the C sources. Marking is done in such a way that each translatable string appears to be the sole argument of some function or preprocessor macro. There are only a few such possible functions or macros meant for translation, and @@ -1667,7 +1902,7 @@ File: gettext.info, Node: Marking, Next: c-format Flag, Prev: Mark Keywords, 4.5 Marking Translatable Strings ================================ -In PO mode, one set of features is meant more for the programmer than + In PO mode, one set of features is meant more for the programmer than for the translator, and allows him to interactively mark which strings, in a set of program sources, are translatable, and which are not. Even if it is a fairly easy job for a programmer to find and mark such @@ -1812,10 +2047,10 @@ File: gettext.info, Node: c-format Flag, Next: Special cases, Prev: Marking, 4.6 Special Comments preceding Keywords ======================================= -In C programs strings are often used within calls of functions from the -`printf' family. The special thing about these format strings is that -they can contain format specifiers introduced with `%'. Assume we have -the code + In C programs strings are often used within calls of functions from +the `printf' family. The special thing about these format strings is +that they can contain format specifiers introduced with `%'. Assume we +have the code printf (gettext ("String `%s' has %d characters\n"), s, strlen (s)); @@ -1882,19 +2117,19 @@ wrong decision is similar to the one used above, only the comment to use must contain the string `xgettext:no-c-format'. If a string is marked with `c-format' and this is not correct the -user can find out who is responsible for the decision. See *Note +user can find out who is responsible for the decision. See *note xgettext Invocation:: to see how the `--debug' option can be used for solving this problem.  -File: gettext.info, Node: Special cases, Next: Names, Prev: c-format Flag, Up: Sources +File: gettext.info, Node: Special cases, Next: Bug Report Address, Prev: c-format Flag, Up: Sources 4.7 Special Cases of Translatable Strings ========================================= -The attentive reader might now point out that it is not always possible -to mark translatable string with `gettext' or something like this. -Consider the following case: + The attentive reader might now point out that it is not always +possible to mark translatable string with `gettext' or something like +this. Consider the following case: { static const char *messages[] = { @@ -1939,7 +2174,7 @@ string from the array. So one solution can look like this: Please convince yourself that the string which is written by `fputs' is translated in any case. How to get `xgettext' know the additional -keyword `gettext_noop' is explained in *Note xgettext Invocation::. +keyword `gettext_noop' is explained in *note xgettext Invocation::. The above is of course not the only solution. You could also come along with the following one: @@ -1970,12 +2205,57 @@ generally not very difficult. If it should be in any situation you can use this second method in this situation.  -File: gettext.info, Node: Names, Next: Libraries, Prev: Special cases, Up: Sources +File: gettext.info, Node: Bug Report Address, Next: Names, Prev: Special cases, Up: Sources + +4.8 Letting Users Report Translation Bugs +========================================= + + Code sometimes has bugs, but translations sometimes have bugs too. +The users need to be able to report them. Reporting translation bugs +to the programmer or maintainer of a package is not very useful, since +the maintainer must never change a translation, except on behalf of the +translator. Hence the translation bugs must be reported to the +translators. + + Here is a way to organize this so that the maintainer does not need +to forward translation bug reports, nor even keep a list of the +addresses of the translators or their translation teams. + + Every program has a place where is shows the bug report address. For +GNU programs, it is the code which handles the "-help" option, +typically in a function called "usage". In this place, instruct the +translator to add her own bug reporting address. For example, if that +code has a statement + + printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); + + you can add some translator instructions like this: + + /* TRANSLATORS: The placeholder indicates the bug-reporting address + for this package. Please add _another line_ saying + "Report translation bugs to <...>\n" with the address for translation + bugs (typically your translation team's web or email address). */ + printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); + + These will be extracted by `xgettext', leading to a .pot file that +contains this: + + #. TRANSLATORS: The placeholder indicates the bug-reporting address + #. for this package. Please add _another line_ saying + #. "Report translation bugs to <...>\n" with the address for translation + #. bugs (typically your translation team's web or email address). + #: src/hello.c:178 + #, c-format + msgid "Report bugs to <%s>.\n" + msgstr "" + + +File: gettext.info, Node: Names, Next: Libraries, Prev: Bug Report Address, Up: Sources -4.8 Marking Proper Names for Translation +4.9 Marking Proper Names for Translation ======================================== -Should names of persons, cities, locations etc. be marked for + Should names of persons, cities, locations etc. be marked for translation or not? People who only know languages that can be written with Latin letters (English, Spanish, French, German, etc.) are tempted to say "no", because names usually do not change when transported @@ -2040,10 +2320,10 @@ major hassle for translators using GNU Emacs or XEmacs with po-mode.  File: gettext.info, Node: Libraries, Prev: Names, Up: Sources -4.9 Preparing Library Sources -============================= +4.10 Preparing Library Sources +============================== -When you are preparing a library, not a program, for the use of + When you are preparing a library, not a program, for the use of `gettext', only a few details are different. Here we assume that the library has a translation domain and a POT file of its own. (If it uses the translation domain and POT file of the main program, then the @@ -2126,8 +2406,8 @@ File: gettext.info, Node: Template, Next: Creating, Prev: Sources, Up: Top 5 Making the PO Template File ***************************** -After preparing the sources, the programmer creates a PO template file. -This section explains how to use `xgettext' for this purpose. + After preparing the sources, the programmer creates a PO template +file. This section explains how to use `xgettext' for this purpose. `xgettext' creates a file named `DOMAINNAME.po'. You should then rename it to `DOMAINNAME.pot'. (Why doesn't `xgettext' create it under @@ -2312,10 +2592,14 @@ extension. * For Scheme: `gettext', `ngettext:1,2', `gettext-noop'. * For Java: `GettextResource.gettext:2', - `GettextResource.ngettext:2,3', `gettext', `ngettext:1,2', - `getString'. + `GettextResource.ngettext:2,3', + `GettextResource.pgettext:2c,3', + `GettextResource.npgettext:2c,3,4', `gettext', `ngettext:1,2', + `pgettext:1c,2', `npgettext:1c,2,3', `getString'. - * For C#: `GetString', `GetPluralString:1,2'. + * For C#: `GetString', `GetPluralString:1,2', + `GetParticularString:1c,2', + `GetParticularPluralString:1c,2,3'. * For awk: `dcgettext', `dcngettext:1,2'. @@ -2383,6 +2667,10 @@ extension. Recognize Qt format strings. This option has an effect only with the language C++. +`--kde' + Recognize KDE 4 format strings. + This option has an effect only with the language C++. + `--boost' Recognize Boost format strings. This option has an effect only with the language C++. @@ -2412,7 +2700,9 @@ adjacent strings, and escaped end of lines for continued strings. Write the .po file using indented style. `--no-location' - Do not write `#: FILENAME:LINE' lines. + Do not write `#: FILENAME:LINE' lines. Note that using this + option makes it harder for technically skilled translators to + understand each message's context. `-n' `--add-location' @@ -2462,6 +2752,9 @@ adjacent strings, and escaped end of lines for continued strings. invocations of `xgettext' on the same files with the same options at different times are guaranteed to produce the same results. + Note that using this option will lead to an error if the resulting + file would not entirely be in ASCII. + `--copyright-holder=STRING' Set the copyright holder in the output. STRING should be the copyright holder of the surrounding package. (Note that the msgstr @@ -2483,13 +2776,20 @@ adjacent strings, and escaped end of lines for continued strings. the GNU project that want their translations to be in the public domain. +`--package-name=PACKAGE' + Set the package name in the header of the output. + +`--package-version=VERSION' + Set the package version in the header of the output. This option + has an effect only if the `--package-name' option is also used. + `--msgid-bugs-address=EMAIL@ADDRESS' Set the reporting address for msgid bugs. This is the email address or URL to which the translators shall report bugs in the untranslated strings: - Strings which are not entire sentences, see the maintainer - guidelines in *Note Preparing Strings::. + guidelines in *note Preparing Strings::. - Strings which use unclear terms or require additional context to be understood. @@ -2537,7 +2837,7 @@ File: gettext.info, Node: Creating, Next: Updating, Prev: Template, Up: Top 6 Creating a New PO File ************************ -When starting a new translation, the translator creates a file called + When starting a new translation, the translator creates a file called `LANG.po', as a copy of the `PACKAGE.pot' template file with modifications in the initial comments (at the beginning of the file) and in the header entry (the first entry, near the beginning of the @@ -2662,18 +2962,19 @@ File: gettext.info, Node: Header Entry, Prev: msginit Invocation, Up: Creatin 6.2 Filling in the Header Entry =============================== -The initial comments "SOME DESCRIPTIVE TITLE", "YEAR" and "FIRST AUTHOR -, YEAR" ought to be replaced by sensible information. -This can be done in any text editor; if Emacs is used and it switched -to PO mode automatically (because it has recognized the file's suffix), -you can disable it by typing `M-x fundamental-mode'. + The initial comments "SOME DESCRIPTIVE TITLE", "YEAR" and "FIRST +AUTHOR , YEAR" ought to be replaced by sensible +information. This can be done in any text editor; if Emacs is used and +it switched to PO mode automatically (because it has recognized the +file's suffix), you can disable it by typing `M-x fundamental-mode'. Modifying the header entry can already be done using PO mode: in Emacs, type `M-x po-mode RET' and then `RET' again to start editing the entry. You should fill in the following fields. Project-Id-Version - This is the name and version of the package. + This is the name and version of the package. Fill it in if it has + not already been filled in by `xgettext'. Report-Msgid-Bugs-To This has already been filled in by `xgettext'. It contains an @@ -2681,7 +2982,7 @@ Report-Msgid-Bugs-To strings: - Strings which are not entire sentences, see the maintainer - guidelines in *Note Preparing Strings::. + guidelines in *note Preparing Strings::. - Strings which use unclear terms or require additional context to be understood. @@ -2717,15 +3018,14 @@ Language-Team In the Free Translation Project, each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, - `http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National - teams" area. + `http://translationproject.org/', in the "Teams" area. Content-Type Replace `CHARSET' with the character encoding used for your language, in your locale, or UTF-8. This field is needed for correct operation of the `msgmerge' and `msgfmt' programs, as well as for users whose locale's character encoding differs from yours - (see *Note Charset conversion::). + (see *note Charset conversion::). You get the character encoding of your locale by running the shell command `locale charmap'. If the result is `C' or @@ -2808,10 +3108,10 @@ Content-Type because in UTF-8 the real quote characters can be represented (single quote characters: U+2018, U+2019, double quote characters: U+201C, U+201D), whereas none of ISO-8859-* charsets has them all. - Users in UTF-8 locales will see the real quote characters, - whereas users in ISO-8859-* locales will see the vertical - apostrophe and the vertical double quote instead (because that's - what the character set conversion will transliterate them to). + Users in UTF-8 locales will see the real quote characters, whereas + users in ISO-8859-* locales will see the vertical apostrophe and + the vertical double quote instead (because that's what the + character set conversion will transliterate them to). To enter such quote characters under X11, you can change your keyboard mapping using the `xmodmap' program. The X11 names of @@ -2833,7 +3133,7 @@ Plural-Forms This field is optional. It is only needed if the PO file has plural forms. You can find them by searching for the `msgid_plural' keyword. The format of the plural forms field is - described in *Note Plural forms::. + described in *note Plural forms::.  File: gettext.info, Node: Updating, Next: Editing, Prev: Creating, Up: Top @@ -2907,7 +3207,7 @@ specified or if it is `-'. 7.1.4 Output file location in update mode ----------------------------------------- -The result is written back to DEF.po. + The result is written back to DEF.po. `--backup=CONTROL' Make a backup of DEF.po @@ -3056,6 +3356,7 @@ File: gettext.info, Node: Editing, Next: Manipulating, Prev: Updating, Up: T * KBabel:: KDE's PO File Editor * Gtranslator:: GNOME's PO File Editor * PO Mode:: Emacs's PO File Editor +* Compendium:: Using Translation Compendia  File: gettext.info, Node: KBabel, Next: Gtranslator, Prev: Editing, Up: Editing @@ -3070,12 +3371,12 @@ File: gettext.info, Node: Gtranslator, Next: PO Mode, Prev: KBabel, Up: Edit ==========================  -File: gettext.info, Node: PO Mode, Prev: Gtranslator, Up: Editing +File: gettext.info, Node: PO Mode, Next: Compendium, Prev: Gtranslator, Up: Editing 8.3 Emacs's PO File Editor ========================== -For those of you being the lucky users of Emacs, PO mode has been + For those of you being the lucky users of Emacs, PO mode has been specifically created for providing a cozy environment for editing or modifying PO files. While editing a PO file, PO mode allows for the easy browsing of auxiliary and compendium PO files, as well as for @@ -3105,7 +3406,6 @@ Untranslated Entries::). * Subedit:: Mode for Editing Translations * C Sources Context:: C Sources Context * Auxiliary:: Consulting Auxiliary PO Files -* Compendium:: Using Translation Compendia  File: gettext.info, Node: Installation, Next: Main PO Commands, Prev: PO Mode, Up: PO Mode @@ -3113,7 +3413,7 @@ File: gettext.info, Node: Installation, Next: Main PO Commands, Prev: PO Mode 8.3.1 Completing GNU `gettext' Installation ------------------------------------------- -Once you have received, unpacked, configured and compiled the GNU + Once you have received, unpacked, configured and compiled the GNU `gettext' distribution, the `make install' command puts in place the programs `xgettext', `msgfmt', `gettext', and `msgmerge', as well as their available message catalogs. To top off a comfortable @@ -3156,7 +3456,7 @@ File: gettext.info, Node: Main PO Commands, Next: Entry Positioning, Prev: In 8.3.2 Main PO mode Commands --------------------------- -After setting up Emacs with something similar to the lines in *Note + After setting up Emacs with something similar to the lines in *note Installation::, PO mode is activated for a window when Emacs finds a PO file in that window. This puts the window read-only and establishes a po-mode-map, which is a genuine Emacs mode, in a way that is not derived @@ -3264,13 +3564,13 @@ File: gettext.info, Node: Entry Positioning, Next: Normalizing, Prev: Main PO 8.3.3 Entry Positioning ----------------------- -The cursor in a PO file window is almost always part of an entry. The -only exceptions are the special case when the cursor is after the last -entry in the file, or when the PO file is empty. The entry where the -cursor is found to be is said to be the current entry. Many PO mode -commands operate on the current entry, so moving the cursor does more -than allowing the translator to browse the PO file, this also selects -on which entry commands operate. + The cursor in a PO file window is almost always part of an entry. +The only exceptions are the special case when the cursor is after the +last entry in the file, or when the PO file is empty. The entry where +the cursor is found to be is said to be the current entry. Many PO +mode commands operate on the current entry, so moving the cursor does +more than allowing the translator to browse the PO file, this also +selects on which entry commands operate. Some PO mode commands alter the position of the cursor in a specialized way. A few of those special purpose positioning are @@ -3378,7 +3678,7 @@ File: gettext.info, Node: Normalizing, Next: Translated Entries, Prev: Entry 8.3.4 Normalizing Strings in Entries ------------------------------------ -There are many different ways for encoding a particular string into a + There are many different ways for encoding a particular string into a PO file entry, because there are so many different ways to split and quote multi-line strings, and even, to represent special characters by backslashed escaped sequences. Some features of PO mode rely on the @@ -3476,8 +3776,8 @@ File: gettext.info, Node: Translated Entries, Next: Fuzzy Entries, Prev: Norm 8.3.5 Translated Entries ------------------------ -Each PO file entry for which the `msgstr' field has been filled with a -translation, and which is not marked as fuzzy (*note Fuzzy Entries::), + Each PO file entry for which the `msgstr' field has been filled with +a translation, and which is not marked as fuzzy (*note Fuzzy Entries::), is said to be a "translated" entry. Only translated entries will later be compiled by GNU `msgfmt' and become usable in programs. Other entry types will be excluded; translation will not occur for them. @@ -3499,7 +3799,7 @@ for an translated entry. If none is found, the search is extended and wraps around in the PO file buffer. Translated entries usually result from the translator having edited -in a translation for them, *Note Modifying Translations::. However, if +in a translation for them, *note Modifying Translations::. However, if the variable `po-auto-fuzzy-on-edit' is not `nil', the entry having received a new translation first becomes a fuzzy entry, which ought to be later unfuzzied before becoming an official, genuine translated @@ -3511,11 +3811,11 @@ File: gettext.info, Node: Fuzzy Entries, Next: Untranslated Entries, Prev: Tr 8.3.6 Fuzzy Entries ------------------- -Each PO file entry may have a set of "attributes", which are qualities -given a name and explicitly associated with the translation, using a -special system comment. One of these attributes has the name `fuzzy', -and entries having this attribute are said to have a fuzzy translation. -They are called fuzzy entries, for short. + Each PO file entry may have a set of "attributes", which are +qualities given a name and explicitly associated with the translation, +using a special system comment. One of these attributes has the name +`fuzzy', and entries having this attribute are said to have a fuzzy +translation. They are called fuzzy entries, for short. Fuzzy entries, even if they account for translated entries for most other purposes, usually call for revision by the translator. Those may @@ -3580,9 +3880,9 @@ File: gettext.info, Node: Untranslated Entries, Next: Obsolete Entries, Prev: 8.3.7 Untranslated Entries -------------------------- -When `xgettext' originally creates a PO file, unless told otherwise, it -initializes the `msgid' field with the untranslated string, and leaves -the `msgstr' string to be empty. Such entries, having an empty + When `xgettext' originally creates a PO file, unless told otherwise, +it initializes the `msgid' field with the untranslated string, and +leaves the `msgstr' string to be empty. Such entries, having an empty translation, are said to be "untranslated" entries. Later, when the programmer slightly modifies some string right in the program, this change is later reflected in the PO file by the appearance of a new @@ -3628,7 +3928,7 @@ File: gettext.info, Node: Obsolete Entries, Next: Modifying Translations, Pre 8.3.8 Obsolete Entries ---------------------- -By "obsolete" PO file entries, we mean those entries which are + By "obsolete" PO file entries, we mean those entries which are commented out, usually by `msgmerge' when it found that the translation is not needed anymore by the package being localized. @@ -3698,16 +3998,16 @@ File: gettext.info, Node: Modifying Translations, Next: Modifying Comments, P 8.3.9 Modifying Translations ---------------------------- -PO mode prevents direct modification of the PO file, by the usual means -Emacs gives for altering a buffer's contents. By doing so, it pretends -helping the translator to avoid little clerical errors about the -overall file format, or the proper quoting of strings, as those errors -would be easily made. Other kinds of errors are still possible, but -some may be caught and diagnosed by the batch validation process, which -the translator may always trigger by the `V' command. For all other -errors, the translator has to rely on her own judgment, and also on the -linguistic reports submitted to her by the users of the translated -package, having the same mother tongue. + PO mode prevents direct modification of the PO file, by the usual +means Emacs gives for altering a buffer's contents. By doing so, it +pretends helping the translator to avoid little clerical errors about +the overall file format, or the proper quoting of strings, as those +errors would be easily made. Other kinds of errors are still possible, +but some may be caught and diagnosed by the batch validation process, +which the translator may always trigger by the `V' command. For all +other errors, the translator has to rely on her own judgment, and also +on the linguistic reports submitted to her by the users of the +translated package, having the same mother tongue. When the time comes to create a translation, correct an error diagnosed mechanically or reported by a user, the translators have to @@ -3851,7 +4151,7 @@ File: gettext.info, Node: Modifying Comments, Next: Subedit, Prev: Modifying 8.3.10 Modifying Comments ------------------------- -Any translation work done seriously will raise many linguistic + Any translation work done seriously will raise many linguistic difficulties, for which decisions have to be made, and the choices further documented. These documents may be saved within the PO file in form of translator comments, which the translator is free to create, @@ -3941,9 +4241,9 @@ File: gettext.info, Node: Subedit, Next: C Sources Context, Prev: Modifying C 8.3.11 Details of Sub Edition ----------------------------- -The PO subedit minor mode has a few peculiarities worth being described -in fuller detail. It installs a few commands over the usual editing set -of Emacs, which are described below. + The PO subedit minor mode has a few peculiarities worth being +described in fuller detail. It installs a few commands over the usual +editing set of Emacs, which are described below. `C-c C-c' Complete edition (`po-subedit-exit'). @@ -4020,7 +4320,7 @@ File: gettext.info, Node: C Sources Context, Next: Auxiliary, Prev: Subedit, 8.3.12 C Sources Context ------------------------ -PO mode is particularly powerful when used with PO files created + PO mode is particularly powerful when used with PO files created through GNU `gettext' utilities, as those utilities insert special comments in the PO files they generate. Some of these special comments relate the PO file entry to exactly where the untranslated string @@ -4118,12 +4418,12 @@ directory at the front of the search path, and the command `M-S' the directories she does not want anymore on the search path.  -File: gettext.info, Node: Auxiliary, Next: Compendium, Prev: C Sources Context, Up: PO Mode +File: gettext.info, Node: Auxiliary, Prev: C Sources Context, Up: PO Mode 8.3.13 Consulting Auxiliary PO Files ------------------------------------ -PO mode is able to help the knowledgeable translator, being fluent in + PO mode is able to help the knowledgeable translator, being fluent in many languages, at taking advantage of translations already achieved in other languages she just happens to know. It provides these other language translations as additional context for her own work. Moreover, @@ -4188,12 +4488,12 @@ between PO mode and other GNU `gettext' tools get fully resolved, the translator should stay aware of normalisation issues.  -File: gettext.info, Node: Compendium, Prev: Auxiliary, Up: PO Mode +File: gettext.info, Node: Compendium, Prev: PO Mode, Up: Editing -8.3.14 Using Translation Compendia ----------------------------------- +8.4 Using Translation Compendia +=============================== -A "compendium" is a special PO file containing a set of translations + A "compendium" is a special PO file containing a set of translations recurring in many different packages. The translator can use gettext tools to build a new compendium, to add entries to her compendium, and to initialize untranslated entries, or to update already translated @@ -4207,19 +4507,19 @@ entries, from translations kept in the compendium.  File: gettext.info, Node: Creating Compendia, Next: Using Compendia, Prev: Compendium, Up: Compendium -8.3.14.1 Creating Compendia -........................... +8.4.1 Creating Compendia +------------------------ -Basically every PO file consisting of translated entries only can be + Basically every PO file consisting of translated entries only can be declared as a valid compendium. Often the translator wants to have special compendia; let's consider two cases: `concatenating PO files' and `extracting a message subset from a PO file'. -8.3.14.2 Concatenate PO Files -............................. +8.4.1.1 Concatenate PO Files +............................ -To concatenate several valid PO files into one compendium file you can -use `msgcomm' or `msgcat' (the latter preferred): + To concatenate several valid PO files into one compendium file you +can use `msgcomm' or `msgcat' (the latter preferred): msgcat -o compendium.po file1.po file2.po @@ -4266,10 +4566,10 @@ entries. If input files are "dirty" you must preprocess the input files or postprocess the result using `msgattrib --translated --no-fuzzy'. -8.3.14.3 Extract a Message Subset from a PO File -................................................ +8.4.1.2 Extract a Message Subset from a PO File +............................................... -Nobody wants to translate the same messages again and again; thus you + Nobody wants to translate the same messages again and again; thus you may wish to have a compendium file containing `getopt.c' messages. To extract a message subset (e.g., all `getopt.c' messages) from an @@ -4280,29 +4580,29 @@ existing PO file into one compendium file you can use `msggrep':  File: gettext.info, Node: Using Compendia, Prev: Creating Compendia, Up: Compendium -8.3.14.4 Using Compendia -........................ +8.4.2 Using Compendia +--------------------- -You can use a compendium file to initialize a translation from scratch -or to update an already existing translation. + You can use a compendium file to initialize a translation from +scratch or to update an already existing translation. -8.3.14.5 Initialize a New Translation File -.......................................... +8.4.2.1 Initialize a New Translation File +......................................... -Since a PO file with translations does not exist the translator can + Since a PO file with translations does not exist the translator can merely use `/dev/null' to fake the "old" translation file. msgmerge --compendium compendium.po -o file.po /dev/null file.pot -8.3.14.6 Update an Existing Translation File -............................................ +8.4.2.2 Update an Existing Translation File +........................................... -Concatenate the compendium file(s) and the existing PO, merge the + Concatenate the compendium file(s) and the existing PO, merge the result with the POT file and remove the obsolete entries (optional, here done using `sed'): msgcat --use-first -o update.po compendium1.po compendium2.po file.po - msgmerge update.po file.pot | sed -e '/^#~/d' > file.po + msgmerge update.po file.pot | msgattrib --no-obsolete > file.po  File: gettext.info, Node: Manipulating, Next: Binaries, Prev: Editing, Up: Top @@ -4310,8 +4610,8 @@ File: gettext.info, Node: Manipulating, Next: Binaries, Prev: Editing, Up: T 9 Manipulating PO Files *********************** -Sometimes it is necessary to manipulate PO files in a way that is better -performed automatically than by hand. GNU `gettext' includes a + Sometimes it is necessary to manipulate PO files in a way that is +better performed automatically than by hand. GNU `gettext' includes a complete set of tools for this purpose. When merging two packages into a single package, the resulting POT @@ -4382,6 +4682,7 @@ write other specialized programs that process PO files. * msgattrib Invocation:: Invoking the `msgattrib' Program * msgen Invocation:: Invoking the `msgen' Program * msgexec Invocation:: Invoking the `msgexec' Program +* Colorizing:: Highlighting parts of PO files * libgettextpo:: Writing your own programs that process PO files  @@ -4477,6 +4778,15 @@ specified or if it is `-'. Use first available translation for each message. Don't merge several translations into one. +`--color' +`--color=WHEN' + Specify whether or when to use colors and other text attributes. + See *note The --color option:: for details. + +`--style=STYLE_FILE' + Specify the CSS style rule file to use for `--color'. See *note + The --style option:: for details. + `--force-po' Always write an output file even if it contains no message. @@ -4708,7 +5018,7 @@ specified or if it is `-'. ----------------------- [-N SOURCEFILE]... [-M DOMAINNAME]... - [-J MSGCTXT-PATTERN [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] + [-J MSGCTXT-PATTERN] [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN] A message is selected if @@ -4732,7 +5042,7 @@ specified or if it is `-'. selected messages is the union of the selected messages of each criterion. - MSGID-PATTERN or MSGSTR-PATTERN syntax: + MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN syntax: [-E | -F] [-e PATTERN | -f FILE]... PATTERNs are basic regular expressions by default, or extended regular expressions if -E is given, or fixed strings if -F is given. @@ -4869,6 +5179,29 @@ regular expressions if -E is given, or fixed strings if -F is given. Output version information and exit. +9.3.7 Examples +-------------- + + To extract the messages that come from the source files +`gnulib-lib/error.c' and `gnulib-lib/getopt.c': + + msggrep -N gnulib-lib/error.c -N gnulib-lib/getopt.c input.po + + To extract the messages that contain the string "Please specify" in +the original string: + + msggrep --msgid -F -e 'Please specify' input.po + + To extract the messages that have a context specifier of either +"Menu>File" or "Menu>Edit" or a submenu of them: + + msggrep --msgctxt -E -e '^Menu>(File|Edit)' input.po + + To extract the messages whose translation contains one of the +strings in the file `wordlist.txt': + + msggrep --msgstr -F -f wordlist.txt input.po +  File: gettext.info, Node: msgfilter Invocation, Next: msguniq Invocation, Prev: msggrep Invocation, Up: Manipulating @@ -4910,7 +5243,7 @@ specified or if it is `-'. 9.4.3 The filter ---------------- -The FILTER can be any program that reads a translation from standard + The FILTER can be any program that reads a translation from standard input and writes a modified translation to standard output. A frequently used filter is `sed'. A few particular built-in filters are also recognized. @@ -4954,8 +5287,8 @@ does not have this limitation. 9.4.5 Built-in FILTERs ---------------------- -The filter `recode-sr-latin' is recognized as a built-in filter. The -command `recode-sr-latin' converts Serbian text, written in the + The filter `recode-sr-latin' is recognized as a built-in filter. +The command `recode-sr-latin' converts Serbian text, written in the Cyrillic script, to the Latin script. The command `msgfilter recode-sr-latin' applies this conversion to the translations of a PO file. Thus, it can be used to convert an `sr.po' file to an @@ -5049,6 +5382,18 @@ needed. Output version information and exit. +9.4.9 Examples +-------------- + + To convert German translations to Swiss orthography (in an UTF-8 +locale): + + msgconv -t UTF-8 de.po | msgfilter sed -e 's/ß/ss/g' + + To convert Serbian translations in Cyrillic script to Latin script: + + msgfilter recode-sr-latin sr.po +  File: gettext.info, Node: msguniq Invocation, Next: msgcomm Invocation, Prev: msgfilter Invocation, Up: Manipulating @@ -5479,7 +5824,7 @@ specified or if it is `-'. 9.8.4 Attribute manipulation ---------------------------- -Attributes are modified after the message selection/removal has been + Attributes are modified after the message selection/removal has been performed. If the `--only-file' or `--ignore-file' option is specified, the attribute modification is applied only to those messages that are listed in the ONLY-FILE and not listed in the IGNORE-FILE. @@ -5719,7 +6064,7 @@ specified or if it is `-'.  -File: gettext.info, Node: msgexec Invocation, Next: libgettextpo, Prev: msgen Invocation, Up: Manipulating +File: gettext.info, Node: msgexec Invocation, Next: Colorizing, Prev: msgen Invocation, Up: Manipulating 9.10 Invoking the `msgexec' Program =================================== @@ -5795,18 +6140,398 @@ using the `LC_ALL' environment variable.  -File: gettext.info, Node: libgettextpo, Prev: msgexec Invocation, Up: Manipulating +File: gettext.info, Node: Colorizing, Next: libgettextpo, Prev: msgexec Invocation, Up: Manipulating + +9.11 Highlighting parts of PO files +=================================== + + Translators are usually only interested in seeing the untranslated +and fuzzy messages of a PO file. Also, when a message is set fuzzy +because the msgid changed, they want to see the differences between the +previous msgid and the current one (especially if the msgid is long and +only few words in it have changed). Finally, it's always welcome to +highlight the different sections of a message in a PO file (comments, +msgid, msgstr, etc.). + + Such highlighting is possible through the `msgcat' options `--color' +and `--style'. + +* Menu: + +* The --color option:: Triggering colorized output +* The TERM variable:: The environment variable `TERM' +* The --style option:: The `--style' option +* Style rules:: Style rules for PO files +* Customizing less:: Customizing `less' for viewing PO files + + +File: gettext.info, Node: The --color option, Next: The TERM variable, Up: Colorizing + +9.11.1 The `--color' option +--------------------------- + + The `--color=WHEN' option specifies under which conditions colorized +output should be generated. The WHEN part can be one of the following: + +`always' +`yes' + The output will be colorized. + +`never' +`no' + The output will not be colorized. + +`auto' +`tty' + The output will be colorized if the output device is a tty, i.e. + when the output goes directly to a text screen or terminal + emulator window. + +`html' + The output will be colorized and be in HTML format. + +`--color' is equivalent to `--color=yes'. The default is +`--color=auto'. + + Thus, a command like `msgcat vi.po' will produce colorized output +when called by itself in a command window. Whereas in a pipe, such as +`msgcat vi.po | less -R', it will not produce colorized output. To get +colorized output in this situation nevertheless, use the command +`msgcat --color vi.po | less -R'. + + The `--color=html' option will produce output that can be viewed in +a browser. This can be useful, for example, for Indic languages, +because the renderic of Indic scripts in browser is usually better than +in terminal emulators. + + Note that the output produced with the `--color' option is _not_ a +valid PO file in itself. It contains additional terminal-specific +escape sequences or HTML tags. A PO file reader will give a syntax +error when confronted with such content. Except for the `--color=html' +case, you therefore normally don't need to save output produced with the +`--color' option in a file. + + +File: gettext.info, Node: The TERM variable, Next: The --style option, Prev: The --color option, Up: Colorizing + +9.11.2 The environment variable `TERM' +-------------------------------------- + + The environment variable `TERM' contains a identifier for the text +window's capabilities. You can get a detailed list of these +cababilities by using the `infocmp' command, using `man 5 terminfo' as a +reference. + + When producing text with embedded color directives, `msgcat' looks +at the `TERM' variable. Text windows today typically support at least +8 colors. Often, however, the text window supports 16 or more colors, +even though the `TERM' variable is set to a identifier denoting only 8 +supported colors. It can be worth setting the `TERM' variable to a +different value in these cases: + +`xterm' + `xterm' is in most cases built with support for 16 colors. It can + also be built with support for 88 or 256 colors (but not both). + You can try to set `TERM' to either `xterm-16color', + `xterm-88color', or `xterm-256color'. + +`rxvt' + `rxvt' is often built with support for 16 colors. You can try to + set `TERM' to `rxvt-16color'. + +`konsole' + `konsole' too is often built with support for 16 colors. You can + try to set `TERM' to `konsole-16color' or `xterm-16color'. + + After setting `TERM', you can verify it by invoking `msgcat +--color=test' and seeing whether the output looks like a reasonable +color map. + + +File: gettext.info, Node: The --style option, Next: Style rules, Prev: The TERM variable, Up: Colorizing + +9.11.3 The `--style' option +--------------------------- + + The `--style=STYLE_FILE' option specifies the style file to use when +colorizing. It has an effect only when the `--color' option is +effective. + + If the `--style' option is not specified, the environment variable +`PO_STYLE' is considered. It is meant to point to the user's preferred +style for PO files. + + The default style file is +`$prefix/share/gettext/styles/po-default.css', where `$prefix' is the +installation location. + + A few style files are predefined: +`po-vim.css' + This style imitates the look used by vim 7. + +`po-emacs-x.css' + This style imitates the look used by GNU Emacs 21 and 22 in an X11 + window. + +`po-emacs-xterm.css' +`po-emacs-xterm16.css' +`po-emacs-xterm256.css' + This style imitates the look used by GNU Emacs 22 in a terminal of + type `xterm' (8 colors) or `xterm-16color' (16 colors) or + `xterm-256color' (256 colors), respectively. + +You can use these styles without specifying a directory. They are +actually located in `$prefix/share/gettext/styles/', where `$prefix' is +the installation location. + + You can also design your own styles. This is described in the next +section. + + +File: gettext.info, Node: Style rules, Next: Customizing less, Prev: The --style option, Up: Colorizing + +9.11.4 Style rules for PO files +------------------------------- + + The same style file can be used for styling of a PO file, for +terminal output and for HTML output. It is written in CSS (Cascading +Style Sheet) syntax. See `http://www.w3.org/TR/css2/cover.html' for a +formal definition of CSS. Many HTML authoring tutorials also contain +explanations of CSS. + + In the case of HTML output, the style file is embedded in the HTML +output. In the case of text output, the style file is interpreted by +the `msgcat' program. This means, in particular, that when `@import' +is used with relative file names, the file names are + + - relative to the resulting HTML file, in the case of HTML output, + + - relative to the style sheet containing the `@import', in the case + of text output. (Actually, `@import's are not yet supported in + this case, due to a limitation in `libcroco'.) + + CSS rules are built up from selectors and declarations. The +declarations specify graphical properties; the selectors specify +specify when they apply. + + In PO files, the following simple selectors (based on "CSS classes", +see the CSS2 spec, section 5.8.3) are supported. + + * Selectors that apply to entire messages: + + `.header' + This matches the header entry of a PO file. + + `.translated' + This matches a translated message. + + `.untranslated' + This matches an untranslated message (i.e. a message with + empty translation). + + `.fuzzy' + This matches a fuzzy message (i.e. a message which has a + translation that needs review by the translator). + + `.obsolete' + This matches an obsolete message (i.e. a message that was + translated but is not needed by the current POT file any + more). + + * Selectors that apply to parts of a message in PO syntax. Recall + the general structure of a message in PO syntax: + + WHITE-SPACE + # TRANSLATOR-COMMENTS + #. EXTRACTED-COMMENTS + #: REFERENCE... + #, FLAG... + #| msgid PREVIOUS-UNTRANSLATED-STRING + msgid UNTRANSLATED-STRING + msgstr TRANSLATED-STRING + + `.comment' + This matches all comments (translator comments, extracted + comments, source file reference comments, flag comments, + previous message comments, as well as the entire obsolete + messages). + + `.translator-comment' + This matches the translator comments. + + `.extracted-comment' + This matches the extracted comments, i.e. the comments placed + by the programmer at the attention of the translator. + + `.reference-comment' + This matches the source file reference comments (entire + lines). + + `.reference' + This matches the individual source file references inside the + source file reference comment lines. + + `.flag-comment' + This matches the flag comment lines (entire lines). + + `.flag' + This matches the individual flags inside flag comment lines. + + `.fuzzy-flag' + This matches the `fuzzy' flag inside flag comment lines. + + `.previous-comment' + This matches the comments containing the previous + untranslated string (entire lines). + + `.previous' + This matches the previous untranslated string including the + string delimiters, the associated keywords (`msgid' etc.) and + the spaces between them. + + `.msgid' + This matches the untranslated string including the string + delimiters, the associated keywords (`msgid' etc.) and the + spaces between them. + + `.msgstr' + This matches the translated string including the string + delimiters, the associated keywords (`msgstr' etc.) and the + spaces between them. + + `.keyword' + This matches the keywords (`msgid', `msgstr', etc.). + + `.string' + This matches strings, including the string delimiters (double + quotes). + + * Selectors that apply to parts of strings: + + `.text' + This matches the entire contents of a string (excluding the + string delimiters, i.e. the double quotes). + + `.escape-sequence' + This matches an escape sequence (starting with a backslash). + + `.format-directive' + This matches a format string directive (starting with a `%' + sign in the case of most programming languages, with a `{' in + the case of `java-format' and `csharp-format', with a `~' in + the case of `lisp-format' and `scheme-format', or with `$' in + the case of `sh-format'). + + `.invalid-format-directive' + This matches an invalid format string directive. + + `.added' + In an untranslated string, this matches a part of the string + that was not present in the previous untranslated string. + (Not yet implemented in this release.) + + `.changed' + In an untranslated string or in a previous untranslated + string, this matches a part of the string that is changed or + replaced. (Not yet implemented in this release.) + + `.removed' + In a previous untranslated string, this matches a part of the + string that is not present in the current untranslated + string. (Not yet implemented in this release.) + + These selectors can be combined to hierarchical selectors. For +example, + + .msgstr .invalid-format-directive { color: red; } + +will highlight the invalid format directives in the translated strings. + + In text mode, pseudo-classes (CSS2 spec, section 5.11) and +pseudo-elements (CSS2 spec, section 5.12) are not supported. + + The declarations in HTML mode are not limited; any graphical +attribute supported by the browsers can be used. + + The declarations in text mode are limited to the following +properties. Other properties will be silently ignored. + +`color' (CSS2 spec, section 14.1) +`background-color' (CSS2 spec, section 14.2.1) + These properties is supported. Colors will be adjusted to match + the terminal's capabilities. Note that many terminals support + only 8 colors. + +`font-weight' (CSS2 spec, section 15.2.3) + This property is supported, but most terminals can only render two + different weights: `normal' and `bold'. Values >= 600 are + rendered as `bold'. + +`font-style' (CSS2 spec, section 15.2.3) + This property is supported. The values `italic' and `oblique' are + rendered the same way. + +`text-decoration' (CSS2 spec, section 16.3.1) + This property is supported, limited to the values `none' and + `underline'. + + +File: gettext.info, Node: Customizing less, Prev: Style rules, Up: Colorizing + +9.11.5 Customizing `less' for viewing PO files +---------------------------------------------- + + The `less' program is a popular text file browser for use in a text +screen or terminal emulator. It also supports text with embedded escape +sequences for colors and text decorations. + + You can use `less' to view a PO file like this (assuming an UTF-8 +environment): + + msgcat --to-code=UTF-8 --color xyz.po | less -R + + You can simplify this to this simple command: + + less xyz.po + +after these three preparations: + + 1. Add the options `-R' and `-f' to the `LESS' environment variable. + In sh shells: + $ LESS="$LESS -R -f" + $ export LESS + + 2. If your system does not already have the `lessopen.sh' and + `lessclose.sh' scripts, create them and set the `LESSOPEN' and + `LESSCLOSE' environment variables, as indicated in the manual page + (`man less'). + + 3. Add to `lessopen.sh' a piece of script that recognizes PO files + through their file extension and invokes `msgcat' on them, + producing a temporary file. Like this: + + case "$1" in + *.po) + tmpfile=`mktemp "${TMPDIR-/tmp}/less.XXXXXX"` + msgcat --to-code=UTF-8 --color "$1" > "$tmpfile" + echo "$tmpfile" + exit 0 + ;; + esac + + +File: gettext.info, Node: libgettextpo, Prev: Colorizing, Up: Manipulating -9.11 Writing your own programs that process PO files +9.12 Writing your own programs that process PO files ==================================================== -For the tasks for which a combination of `msgattrib', `msgcat' etc. is -not sufficient, a set of C functions is provided in a library, to make -it possible to process PO files in your own programs. When you use -this library, you don't need to write routines to parse the PO file; -instead, you retrieve a pointer in memory to each of messages contained -in the PO file. Functions for writing PO files are not provided at -this time. + For the tasks for which a combination of `msgattrib', `msgcat' etc. +is not sufficient, a set of C functions is provided in a library, to +make it possible to process PO files in your own programs. When you +use this library, you don't need to write routines to parse the PO +file; instead, you retrieve a pointer in memory to each of messages +contained in the PO file. Functions for writing PO files are not +provided at this time. The functions are declared in the header file `', and are defined in a library called `libgettextpo'. @@ -6336,7 +7061,7 @@ File: gettext.info, Node: MO Files, Prev: msgunfmt Invocation, Up: Binaries 10.3 The Format of GNU MO Files =============================== -The format of the generated MO files is best described by a picture, + The format of the generated MO files is best described by a picture, which appears below. The first two words serve the identification of the file. The magic @@ -6476,8 +7201,8 @@ File: gettext.info, Node: Programmers, Next: Translators, Prev: Binaries, Up 11 The Programmer's View ************************ -One aim of the current message catalog implementation provided by GNU -`gettext' was to use the system's message catalog handling, if the + One aim of the current message catalog implementation provided by +GNU `gettext' was to use the system's message catalog handling, if the installer wishes to do so. So we perhaps should first take a look at the solutions we know about. The people in the POSIX committee did not manage to agree on one of the semi-official standards which we'll @@ -6502,7 +7227,7 @@ File: gettext.info, Node: catgets, Next: gettext, Prev: Programmers, Up: Pro 11.1 About `catgets' ==================== -The `catgets' implementation is defined in the X/Open Portability + The `catgets' implementation is defined in the X/Open Portability Guide, Volume 3, XSI Supplementary Definitions, Chapter 5. But the process of creating this standard seemed to be too slow for some of the Unix vendors so they created their implementations on preliminary @@ -6534,7 +7259,7 @@ File: gettext.info, Node: Interface to catgets, Next: Problems with catgets, 11.1.1 The Interface -------------------- -The interface to the `catgets' implementation consists of three + The interface to the `catgets' implementation consists of three functions which correspond to those used in file access: `catopen' to open the catalog for using, `catgets' for accessing the message tables, and `catclose' for closing after work is done. Prototypes for the @@ -6584,7 +7309,7 @@ File: gettext.info, Node: Problems with catgets, Prev: Interface to catgets, 11.1.2 Problems with the `catgets' Interface?! ---------------------------------------------- -Now that this description seemed to be really easy -- where are the + Now that this description seemed to be really easy -- where are the problems we speak of? In fact the interface could be used in a reasonable way, but constructing the message catalogs is a pain. The reason for this lies in the third argument of `catgets': the unique @@ -6602,7 +7327,7 @@ File: gettext.info, Node: gettext, Next: Comparison, Prev: catgets, Up: Prog 11.2 About `gettext' ==================== -The definition of the `gettext' interface comes from a Uniforum + The definition of the `gettext' interface comes from a Uniforum proposal. It was submitted there by Sun, who had implemented the `gettext' function in SunOS 4, around 1990. Nowadays, the `gettext' interface is specified by the OpenI18N standard. @@ -6611,7 +7336,7 @@ interface is specified by the OpenI18N standard. method of normal file handling (open-use-close) and that it does not burden the programmer with so many tasks, especially the unique key handling. Of course here also a unique key is needed, but this key is -the message itself (how long or short it is). See *Note Comparison:: +the message itself (how long or short it is). See *note Comparison:: for a more detailed comparison of the two methods. The following section contains a rather detailed description of the @@ -6635,7 +7360,7 @@ File: gettext.info, Node: Interface to gettext, Next: Ambiguities, Prev: gett 11.2.1 The Interface -------------------- -The minimal functionality an interface must have is a) to select a + The minimal functionality an interface must have is a) to select a domain the strings are coming from (a single domain for all programs is not reasonable because its construction and maintenance is difficult, perhaps impossible) and b) to access a string in a selected domain. @@ -6667,10 +7392,9 @@ the current domain. If it is not available, the argument itself is returned. If the argument is `NULL' the result is undefined. One thing which should come into mind is that no explicit dependency -to the used domain is given. The current value of the domain for the -`LC_MESSAGES' locale is used. If this changes between two executions -of the same `gettext' call in the program, both calls reference a -different message catalog. +to the used domain is given. The current value of the domain is used. +If this changes between two executions of the same `gettext' call in +the program, both calls reference a different message catalog. For the easiest case, which is normally used in internationalized packages, once at the beginning of execution a call to `textdomain' is @@ -6685,7 +7409,7 @@ File: gettext.info, Node: Ambiguities, Next: Locating Catalogs, Prev: Interfa 11.2.2 Solving Ambiguities -------------------------- -While this single name domain works well for most applications there + While this single name domain works well for most applications there might be the need to get translations from more than one domain. Of course one could switch between different domains with calls to `textdomain', but this is really not convenient nor is it fast. A @@ -6704,9 +7428,9 @@ For this reasons there are two more functions to retrieve strings: Both take an additional argument at the first place, which corresponds to the argument of `textdomain'. The third argument of -`dcgettext' allows to use another locale but `LC_MESSAGES'. But I -really don't know where this can be useful. If the DOMAIN_NAME is -`NULL' or CATEGORY has an value beside the known ones, the result is +`dcgettext' allows to use another locale category but `LC_MESSAGES'. +But I really don't know where this can be useful. If the DOMAIN_NAME +is `NULL' or CATEGORY has an value beside the known ones, the result is undefined. It should also be noted that this function is not part of the second known implementation of this function family, the one found in Solaris. @@ -6740,13 +7464,13 @@ File: gettext.info, Node: Locating Catalogs, Next: Charset conversion, Prev: 11.2.3 Locating Message Catalog Files ------------------------------------- -Because many different languages for many different packages have to be -stored we need some way to add these information to file message catalog -files. The way usually used in Unix environments is have this encoding -in the file name. This is also done here. The directory name given in -`bindtextdomain's second argument (or the default directory), followed -by the value and name of the locale and the domain name are -concatenated: + Because many different languages for many different packages have to +be stored we need some way to add these information to file message +catalog files. The way usually used in Unix environments is have this +encoding in the file name. This is also done here. The directory name +given in `bindtextdomain's second argument (or the default directory), +followed by the name of the locale, the locale category, and the domain +name are concatenated: DIR_NAME/LOCALE/LC_CATEGORY/DOMAIN_NAME.mo @@ -6754,18 +7478,19 @@ concatenated: library, and for packages adhering to its conventions, it's: /usr/local/share/locale -LOCALE is the value of the locale whose name is this `LC_CATEGORY'. -For `gettext' and `dgettext' this `LC_CATEGORY' is always -`LC_MESSAGES'.(1) The value of the locale is determined through -`setlocale (LC_CATEGORY, NULL)'. (2) `dcgettext' specifies the locale -category by the third argument. +LOCALE is the name of the locale category which is designated by +`LC_CATEGORY'. For `gettext' and `dgettext' this `LC_CATEGORY' is +always `LC_MESSAGES'.(1) The name of the locale category is determined +through `setlocale (LC_CATEGORY, NULL)'. (2) When using the function +`dcgettext', you can specify the locale category through the third +argument. ---------- Footnotes ---------- - (1) Some system, eg Ultrix, don't have `LC_MESSAGES'. Here we use a -more or less arbitrary value for it, namely 1729, the smallest positive -integer which can be represented in two different ways as the sum of -two cubes. + (1) Some system, e.g. mingw, don't have `LC_MESSAGES'. Here we use +a more or less arbitrary value for it, namely 1729, the smallest +positive integer which can be represented in two different ways as the +sum of two cubes. (2) When the system does not support `setlocale' its behavior in setting the locale values is simulated by looking at the environment @@ -6777,7 +7502,7 @@ File: gettext.info, Node: Charset conversion, Next: Contexts, Prev: Locating 11.2.4 How to specify the output character set `gettext' uses ------------------------------------------------------------- -`gettext' not only looks up a translation in a message catalog. It + `gettext' not only looks up a translation in a message catalog. It also converts the translation on the fly to the desired output character set. This is useful if the user is working in a different character set than the translator who created the message catalog, because it avoids @@ -6826,7 +7551,7 @@ File: gettext.info, Node: Contexts, Next: Plural forms, Prev: Charset convers 11.2.5 Using contexts for solving ambiguities --------------------------------------------- -One place where the `gettext' functions, if used normally, have big + One place where the `gettext' functions, if used normally, have big problems is within programs with graphical user interfaces (GUIs). The problem is that many of the strings which have to be translated are very short. They have to appear in pull-down menus which restricts the @@ -6885,7 +7610,7 @@ particular translation of the MSGID. These are generalizations of `pgettext'. They behave similarly to `dgettext' and `dcgettext', respectively. The DOMAIN_NAME argument defines the translation domain. The CATEGORY argument allows to use -another locale facet than `LC_MESSAGES'. +another locale category than `LC_MESSAGES'. As as example consider the following fictional situation. A GUI program has a menu bar with the following entries: @@ -6950,7 +7675,7 @@ File: gettext.info, Node: Plural forms, Next: Optimized gettext, Prev: Contex 11.2.6 Additional functions for plural forms -------------------------------------------- -The functions of the `gettext' family described so far (and all the + The functions of the `gettext' family described so far (and all the `catgets' functions as well) have one problem in the real world which have been neglected completely in all existing approaches. What is meant here is the handling of plural forms. @@ -7167,7 +7892,7 @@ Two forms, singular used for one only sentences involving cardinal numbers. For example, "1 apple" is "1 alma", and "123 apples" is "123 alma". But when the number is not explicit, the distinction between singular and plural exists: - "the apple" is "az alma", and "the apples" is "az alma'k". Since + "the apple" is "az alma", and "the apples" is "az almák". Since `ngettext' has to support both types of sentences, it is classified here, under "two forms". @@ -7319,9 +8044,9 @@ File: gettext.info, Node: Optimized gettext, Prev: Plural forms, Up: gettext 11.2.7 Optimization of the *gettext functions --------------------------------------------- -At this point of the discussion we should talk about an advantage of the -GNU `gettext' implementation. Some readers might have pointed out that -an internationalized program might have a poor performance if some + At this point of the discussion we should talk about an advantage of +the GNU `gettext' implementation. Some readers might have pointed out +that an internationalized program might have a poor performance if some string has to be translated in an inner loop. While this is unavoidable when the string varies from one run of the loop to the other it is simply a waste of time when the string is always the same. Take the @@ -7359,7 +8084,7 @@ File: gettext.info, Node: Comparison, Next: Using libintl.a, Prev: gettext, 11.3 Comparing the Two Interfaces ================================= -The following discussion is perhaps a little bit colored. As said + The following discussion is perhaps a little bit colored. As said above we implemented GNU `gettext' following the Uniforum proposal and this surely has its reasons. But it should show how we came to this decision. @@ -7456,7 +8181,7 @@ File: gettext.info, Node: Using libintl.a, Next: gettext grok, Prev: Comparis 11.4 Using libintl.a in own programs ==================================== -Starting with version 0.9.4 the library `libintl.h' should be + Starting with version 0.9.4 the library `libintl.h' should be self-contained. I.e., you can use it in your own programs without providing additional functions. The `Makefile' will put the header and the library in directories selected using the `$(prefix)'. @@ -7467,7 +8192,7 @@ File: gettext.info, Node: gettext grok, Next: Temp Programmers, Prev: Using l 11.5 Being a `gettext' grok =========================== -* NOTE: * This documentation section is outdated and needs to be + * NOTE: * This documentation section is outdated and needs to be revised. To fully exploit the functionality of the GNU `gettext' library it @@ -7493,7 +8218,7 @@ is a list comments: 2. `LC_ALL' - 3. `LC_xxx', according to selected locale + 3. `LC_xxx', according to selected locale category 4. `LANG' @@ -7535,7 +8260,7 @@ File: gettext.info, Node: Temp Programmers, Prev: gettext grok, Up: Programme 11.6 Temporary Notes for the Programmers Chapter ================================================ -* NOTE: * This documentation section is outdated and needs to be + * NOTE: * This documentation section is outdated and needs to be revised. * Menu: @@ -7551,8 +8276,8 @@ File: gettext.info, Node: Temp Implementations, Next: Temp catgets, Prev: Tem 11.6.1 Temporary - Two Possible Implementations ----------------------------------------------- -There are two competing methods for language independent messages: the -X/Open `catgets' method, and the Uniforum `gettext' method. The + There are two competing methods for language independent messages: +the X/Open `catgets' method, and the Uniforum `gettext' method. The `catgets' method indexes messages by integers; the `gettext' method indexes them by their English translations. The `catgets' method has been around longer and is supported by more vendors. The `gettext' @@ -7578,8 +8303,8 @@ File: gettext.info, Node: Temp catgets, Next: Temp WSI, Prev: Temp Implementa 11.6.2 Temporary - About `catgets' ---------------------------------- -There have been a few discussions of late on the use of `catgets' as a -base. I think it important to present both sides of the argument and + There have been a few discussions of late on the use of `catgets' as +a base. I think it important to present both sides of the argument and hence am opting to play devil's advocate for a little bit. I'll not deny the fact that `catgets' could have been designed a lot @@ -7613,7 +8338,7 @@ File: gettext.info, Node: Temp WSI, Next: Temp Notes, Prev: Temp catgets, Up 11.6.3 Temporary - Why a single implementation ---------------------------------------------- -Now it seems kind of wasteful to me to have two different systems + Now it seems kind of wasteful to me to have two different systems installed for accessing message catalogs. If we do want to remedy `catgets' deficiencies why don't we try to expand `catgets' (in a compatible manner) rather than implement an entirely new system. @@ -7636,7 +8361,7 @@ access routines) with their software instead of just including the `libintl' code with their software. Message catalog support is however only the tip of the iceberg. -What about the data for the other locale categories. They also have a +What about the data for the other locale categories? They also have a number of deficiencies. Are we going to abandon them as well and develop another duplicate set of routines (should `libintl' expand beyond message catalog support)? @@ -7651,7 +8376,7 @@ File: gettext.info, Node: Temp Notes, Prev: Temp WSI, Up: Temp Programmers 11.6.4 Temporary - Notes ------------------------ -X/Open agreed very late on the standard form so that many + X/Open agreed very late on the standard form so that many implementations differ from the final form. Both of my system (old Linux catgets and Ultrix-4) have a strange variation. @@ -7680,7 +8405,7 @@ File: gettext.info, Node: Trans Intro 0, Next: Trans Intro 1, Prev: Translato 12.1 Introduction 0 =================== -* NOTE: * This documentation section is outdated and needs to be + * NOTE: * This documentation section is outdated and needs to be revised. Free software is going international! The Translation Project is a @@ -7722,8 +8447,8 @@ body: Keep in mind that team members should be interested in _working_ at translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to -start one, please write to `translation@iro.umontreal.ca'; you will -then reach the coordinator for all translator teams. +start one, please write to `coordinator@translationproject.org'; you +will then reach the coordinator for all translator teams. A handful of GNU packages have already been adapted and provided with message translations for several languages. Translation teams @@ -7731,8 +8456,8 @@ have begun to organize, using these packages as a starting point. But there are many more packages and many languages for which we have no volunteer translators. If you would like to volunteer to work at translating messages, please send mail to -`translation@iro.umontreal.ca' indicating what language(s) you can work -on. +`coordinator@translationproject.org' indicating what language(s) you +can work on.  File: gettext.info, Node: Trans Intro 1, Next: Discussions, Prev: Trans Intro 0, Up: Translators @@ -7740,7 +8465,7 @@ File: gettext.info, Node: Trans Intro 1, Next: Discussions, Prev: Trans Intro 12.2 Introduction 1 =================== -* NOTE: * This documentation section is outdated and needs to be + * NOTE: * This documentation section is outdated and needs to be revised. This is now official, GNU is going international! Here is the @@ -7752,8 +8477,8 @@ announcement submitted for the January 1995 GNU Bulletin: point. But there are many more packages and many languages for which we have no volunteer translators. If you'd like to volunteer to work at translating messages, please send mail to - `translation@iro.umontreal.ca' indicating what language(s) you can - work on. + `coordinator@translationproject.org' indicating what language(s) + you can work on. This document should answer many questions for those who are curious about the process or would like to contribute. Please at least skim @@ -7774,7 +8499,7 @@ enthusiastic response from pretesters, so we believe that internationalization of free software is dedicated to succeed. For suggestion clarifications, additions or corrections to this -document, please e-mail to `translation@iro.umontreal.ca'. +document, please e-mail to `coordinator@translationproject.org'.  File: gettext.info, Node: Discussions, Next: Organization, Prev: Trans Intro 1, Up: Translators @@ -7782,7 +8507,7 @@ File: gettext.info, Node: Discussions, Next: Organization, Prev: Trans Intro 12.3 Discussions ================ -* NOTE: * This documentation section is outdated and needs to be + * NOTE: * This documentation section is outdated and needs to be revised. Facing this internationalization effort, a few users expressed their @@ -7862,7 +8587,7 @@ File: gettext.info, Node: Organization, Next: Information Flow, Prev: Discuss 12.4 Organization ================= -* NOTE: * This documentation section is outdated and needs to be + * NOTE: * This documentation section is outdated and needs to be revised. On a larger scale, the true solution would be to organize some kind @@ -7891,9 +8616,9 @@ coordinators. Localizing evolving programs will surely become a permanent and continuous activity in the free software community, once well started. The setup should be minimally completed and tested before GNU `gettext' becomes an official reality. The e-mail address -`translation@iro.umontreal.ca' has been setup for receiving offers from -volunteers and general e-mail on these topics. This address reaches -the Translation Project coordinator. +`coordinator@translationproject.org' has been set up for receiving +offers from volunteers and general e-mail on these topics. This address +reaches the Translation Project coordinator. * Menu: @@ -7907,8 +8632,8 @@ File: gettext.info, Node: Central Coordination, Next: National Teams, Prev: O 12.4.1 Central Coordination --------------------------- -I also think GNU will need sooner than it thinks, that someone setup a -way to organize and coordinate these groups. Some kind of group of + I also think GNU will need sooner than it thinks, that someone set up +a way to organize and coordinate these groups. Some kind of group of groups. My opinion is that it would be good that GNU delegates this task to a small group of collaborating volunteers, shortly. Perhaps in `gnu.announce' a list of this national committee's can be published. @@ -7930,7 +8655,7 @@ File: gettext.info, Node: National Teams, Next: Mailing Lists, Prev: Central 12.4.2 National Teams --------------------- -I suggest we look for volunteer coordinators/editors for individual + I suggest we look for volunteer coordinators/editors for individual languages. These people will scan contributions of translation files for various programs, for their own languages, and will ensure high and uniform standards of diction. @@ -7985,11 +8710,12 @@ File: gettext.info, Node: Sub-Cultures, Next: Organizational Ideas, Prev: Nat 12.4.2.1 Sub-Cultures ..................... -Taking French for example, there are a few sub-cultures around computers -which developed diverging vocabularies. Picking volunteers here and -there without addressing this problem in an organized way, soon in the -project, might produce a distasteful mix of internationalized programs, -and possibly trigger endless quarrels among those who really care. + Taking French for example, there are a few sub-cultures around +computers which developed diverging vocabularies. Picking volunteers +here and there without addressing this problem in an organized way, +soon in the project, might produce a distasteful mix of +internationalized programs, and possibly trigger endless quarrels among +those who really care. Keeping some kind of unity in the way French localization of internationalized programs is achieved is a difficult (and delicate) @@ -8005,10 +8731,10 @@ File: gettext.info, Node: Organizational Ideas, Prev: Sub-Cultures, Up: Natio 12.4.2.2 Organizational Ideas ............................. -I expect the next big changes after the official release. Please note -that I use the German translation of the short GPL message. We need to -set a few good examples before the localization goes out for true in -the free software community. Here are a few points to discuss: + I expect the next big changes after the official release. Please +note that I use the German translation of the short GPL message. We +need to set a few good examples before the localization goes out for +true in the free software community. Here are a few points to discuss: * Each group should have one FTP server (at least one master). @@ -8031,15 +8757,15 @@ File: gettext.info, Node: Mailing Lists, Prev: National Teams, Up: Organizati 12.4.3 Mailing Lists -------------------- -If we get any inquiries about GNU `gettext', send them on to: + If we get any inquiries about GNU `gettext', send them on to: - `translation@iro.umontreal.ca' + `coordinator@translationproject.org' The `*-pretest' lists are quite useful to me, maybe the idea could be generalized to many GNU, and non-GNU packages. But each maintainer his/her way! - Franc,ois, we have a mechanism in place here at `gnu.ai.mit.edu' to + François, we have a mechanism in place here at `gnu.ai.mit.edu' to track teams, support mailing lists for them and log members. We have a slight preference that you use it. If this is OK with you, I can get you clued in. @@ -8071,7 +8797,7 @@ File: gettext.info, Node: Information Flow, Next: Prioritizing messages, Prev 12.5 Information Flow ===================== -* NOTE: * This documentation section is outdated and needs to be + * NOTE: * This documentation section is outdated and needs to be revised. There will surely be some discussion about this messages after the @@ -8115,7 +8841,7 @@ File: gettext.info, Node: Prioritizing messages, Prev: Information Flow, Up: 12.6 Prioritizing messages: How to determine which messages to translate first ============================================================================== -A translator sometimes has only a limited amount of time per week to + A translator sometimes has only a limited amount of time per week to spend on a package, and some packages have quite large message catalogs (over 1000 messages). Therefore she wishes to translate the messages first that are the most visible to the user, or that occur most @@ -8184,7 +8910,7 @@ domain and source package. She takes the latest copy of `$lang.po' from the Translation Project, or from the package (in most cases, `$package/po/$lang.po'), or creates -a fresh one if she's the first translator (see *Note Creating::). She +a fresh one if she's the first translator (see *note Creating::). She then uses the following commands to mark the not urgent messages as "obsolete". (This doesn't mean that these messages - translated and untranslated ones - will go away. It simply means that the PO file @@ -8214,8 +8940,8 @@ File: gettext.info, Node: Maintainers, Next: Installers, Prev: Translators, 13 The Maintainer's View ************************ -The maintainer of a package has many responsibilities. One of them is -ensuring that the package will install easily on many platforms, and + The maintainer of a package has many responsibilities. One of them +is ensuring that the package will install easily on many platforms, and that the magic we described earlier (*note Users::) will work for installers and end users. @@ -8227,7 +8953,7 @@ standards, or even better, Gnits standards, because GNU `gettext' is purposely for helping the internationalization of the whole GNU project, and as many other good free packages as possible. So, the maintainer's view presented here presumes that the package already has -a `configure.in' file and uses GNU Autoconf. +a `configure.ac' file and uses GNU Autoconf. Nevertheless, GNU `gettext' may surely be useful for free packages not following GNU standards and conventions, but the maintainers of such @@ -8245,7 +8971,7 @@ ideally revise this chapter in subsequent releases, looking for changes. * Prerequisites:: Prerequisite Works * gettextize Invocation:: Invoking the `gettextize' Program * Adjusting Files:: Files You Must Create or Alter -* autoconf macros:: Autoconf macros for use in `configure.in' +* autoconf macros:: Autoconf macros for use in `configure.ac' * CVS Issues:: Integrating with CVS * Release Management:: Creating a Distribution Tarball @@ -8255,8 +8981,8 @@ File: gettext.info, Node: Flat and Non-Flat, Next: Prerequisites, Prev: Maint 13.1 Flat or Non-Flat Directory Structures ========================================== -Some free software packages are distributed as `tar' files which unpack -in a single directory, these are said to be "flat" distributions. + Some free software packages are distributed as `tar' files which +unpack in a single directory, these are said to be "flat" distributions. Other free software packages have a one level hierarchy of subdirectories, using for example a subdirectory named `doc/' for the Texinfo manual and man pages, another called `lib/' for holding @@ -8284,10 +9010,10 @@ File: gettext.info, Node: Prerequisites, Next: gettextize Invocation, Prev: F 13.2 Prerequisite Works ======================= -There are some works which are required for using GNU `gettext' in one -of your package. These works have some kind of generality that escape -the point by point descriptions used in the remainder of this chapter. -So, we describe them here. + There are some works which are required for using GNU `gettext' in +one of your package. These works have some kind of generality that +escape the point by point descriptions used in the remainder of this +chapter. So, we describe them here. * Before attempting to use `gettextize' you should install some other packages first. Ensure that recent versions of GNU `m4', @@ -8311,8 +9037,8 @@ So, we describe them here. GNU `gettext' shall then be installed at the user site if the end users want to see the translation of shell script messages. - * Your package should use Autoconf and have a `configure.in' or - `configure.ac' file. If it does not, you have to learn how. The + * Your package should use Autoconf and have a `configure.ac' or + `configure.in' file. If it does not, you have to learn how. The Autoconf documentation is quite well written, it is a good idea that you print it and get familiar with it. @@ -8332,10 +9058,10 @@ So, we describe them here. ideally behave with PO files submissions. As a maintainer, your role is to authenticate the origin of the submission as being the representative of the appropriate translating teams of the Translation Project (forward -the submission to `translation@iro.umontreal.ca' in case of doubt), to -ensure that the PO file format is not severely broken and does not -prevent successful installation, and for the rest, to merely put these -PO files in `po/' for distribution. +the submission to `coordinator@translationproject.org' in case of +doubt), to ensure that the PO file format is not severely broken and +does not prevent successful installation, and for the rest, to merely +put these PO files in `po/' for distribution. As a maintainer, you do not have to take on your shoulders the responsibility of checking if the translations are adequate or @@ -8362,7 +9088,7 @@ File: gettext.info, Node: gettextize Invocation, Next: Adjusting Files, Prev: 13.3 Invoking the `gettextize' Program ====================================== -The `gettextize' program is an interactive tool that helps the + The `gettextize' program is an interactive tool that helps the maintainer of a package internationalized through GNU `gettext'. It is used for two purposes: @@ -8379,7 +9105,7 @@ used for two purposes: `gettext'. * It performs as many of the tasks mentioned in the next section - *Note Adjusting Files:: as can be performed automatically. + *note Adjusting Files:: as can be performed automatically. * It removes obsolete files and idioms used for previous GNU `gettext' versions to the form recommended for the current GNU @@ -8402,10 +9128,17 @@ and accepts the following options: Install the libintl sources in a subdirectory named `intl/'. This libintl will be used to provide internationalization on systems that don't have GNU libintl installed. If this option is omitted, - the call to `AM_GNU_GETTEXT' in `configure.in' should read: + the call to `AM_GNU_GETTEXT' in `configure.ac' should read: `AM_GNU_GETTEXT([external])', and internationalization will not be enabled on systems lacking GNU gettext. +`--po-dir=DIR' + Specify a directory containing PO files. Such a directory + contains the translations into various languages of a particular + POT file. This option can be specified multiple times, once for + each translation domain. If it is not specified, the directory + named `po/' is updated. + `--no-changelog' Don't update or create ChangeLog files. By default, `gettextize' logs all changes (file additions, modifications and removals) in a @@ -8457,6 +9190,9 @@ specified. with the files it contains, and only `Makefile.in.in' and the auxiliary files will be overwritten. + If `--po-dir' has been specified, this holds for every directory + specified through `--po-dir', instead of `po/'. + 3. Only if `--intl' has been specified: A `intl/' directory is created and filled with most of the files originally in the `intl/' directory of the GNU `gettext' distribution. Also, if @@ -8480,8 +9216,8 @@ distribution archive. So, to insist, you really should use `-h' option with `tar' within your `dist' goal of your main `Makefile.in'. Furthermore, `gettextize' will update all `Makefile.am' files in -each affected directory, as well as the top level `configure.in' or -`configure.ac' file. +each affected directory, as well as the top level `configure.ac' or +`configure.in' file. It is interesting to understand that most new files for supporting GNU `gettext' facilities in one package go in `intl/', `po/' and `m4/' @@ -8501,18 +9237,18 @@ is added or replaced or removed as a whole. entire job of adapting a package for using GNU `gettext'. The amount of remaining work depends on whether the package uses GNU `automake' or not. But in any case, the maintainer should still read the section -*Note Adjusting Files:: after invoking `gettextize'. +*note Adjusting Files:: after invoking `gettextize'. In particular, if after using `gettexize', you get an error `AC_COMPILE_IFELSE was called before AC_GNU_SOURCE' or `AC_RUN_IFELSE was called before AC_GNU_SOURCE', you can fix it by modifying -`configure.ac', as described in *Note configure.in::. +`configure.ac', as described in *note configure.ac::. It is also important to understand that `gettextize' is not part of the GNU build system, in the sense that it should not be invoked automatically, and not be invoked by someone who doesn't assume the responsibilities of a package maintainer. For the latter purpose, a -separate tool is provided, see *Note autopoint Invocation::. +separate tool is provided, see *note autopoint Invocation::.  File: gettext.info, Node: Adjusting Files, Next: autoconf macros, Prev: gettextize Invocation, Up: Maintainers @@ -8520,8 +9256,8 @@ File: gettext.info, Node: Adjusting Files, Next: autoconf macros, Prev: gette 13.4 Files You Must Create or Alter =================================== -Besides files which are automatically added through `gettextize', there -are many files needing revision for properly interacting with GNU + Besides files which are automatically added through `gettextize', +there are many files needing revision for properly interacting with GNU `gettext'. If you are closely following GNU standards for Makefile engineering and auto-configuration, the adaptations should be easier to achieve. Here is a point by point description of the changes needed in @@ -8529,7 +9265,7 @@ each. So, here comes a list of files, each one followed by a description of all alterations it needs. Many examples are taken out from the GNU -`gettext' 0.16 distribution itself, or from the GNU `hello' +`gettext' 0.17 distribution itself, or from the GNU `hello' distribution (`http://www.franken.de/users/gnu/ke/hello' or `http://www.gnu.franken.de/ke/hello/') You may indeed refer to the source code of the GNU `gettext' and GNU `hello' packages, as they are @@ -8541,7 +9277,7 @@ intended to be good examples for using GNU gettext functionality. * po/LINGUAS:: `LINGUAS' in `po/' * po/Makevars:: `Makevars' in `po/' * po/Rules-*:: Extending `Makefile' in `po/' -* configure.in:: `configure.in' at top level +* configure.ac:: `configure.ac' at top level * config.guess:: `config.guess', `config.sub' at top level * mkinstalldirs:: `mkinstalldirs' at top level * aclocal:: `aclocal.m4' at top level @@ -8557,7 +9293,7 @@ File: gettext.info, Node: po/POTFILES.in, Next: po/LINGUAS, Prev: Adjusting F 13.4.1 `POTFILES.in' in `po/' ----------------------------- -The `po/' directory should receive a file named `POTFILES.in'. This + The `po/' directory should receive a file named `POTFILES.in'. This file tells which files, among all program sources, have marked strings needing translation. Here is an example of such a file: @@ -8591,10 +9327,10 @@ File: gettext.info, Node: po/LINGUAS, Next: po/Makevars, Prev: po/POTFILES.in 13.4.2 `LINGUAS' in `po/' ------------------------- -The `po/' directory should also receive a file named `LINGUAS'. This -file contains the list of available translations. It is a whitespace -separated list. Hash-marked comments and white lines are ignored. -Here is an example file: + The `po/' directory should also receive a file named `LINGUAS'. +This file contains the list of available translations. It is a +whitespace separated list. Hash-marked comments and white lines are +ignored. Here is an example file: # Set of available languages. de fr @@ -8627,7 +9363,7 @@ File: gettext.info, Node: po/Makevars, Next: po/Rules-*, Prev: po/LINGUAS, U 13.4.3 `Makevars' in `po/' -------------------------- -The `po/' directory also has a file named `Makevars'. It contains + The `po/' directory also has a file named `Makevars'. It contains variables that are specific to your project. `po/Makevars' gets inserted into the `po/Makefile' when the latter is created. The variables thus take effect when the POT file is created or updated, and @@ -8639,15 +9375,19 @@ Only packages which have multiple `po/' directories at different locations need to adjust the three first variables defined in `Makevars'. + As an alternative to the `XGETTEXT_OPTIONS' variables, it is also +possible to specify `xgettext' options through the `AM_XGETTEXT_OPTION' +autoconf macro. See *note AM_XGETTEXT_OPTION::. +  -File: gettext.info, Node: po/Rules-*, Next: configure.in, Prev: po/Makevars, Up: Adjusting Files +File: gettext.info, Node: po/Rules-*, Next: configure.ac, Prev: po/Makevars, Up: Adjusting Files 13.4.4 Extending `Makefile' in `po/' ------------------------------------ -All files called `Rules-*' in the `po/' directory get appended to the -`po/Makefile' when it is created. They present an opportunity to add -rules for special PO files to the Makefile, without needing to mess + All files called `Rules-*' in the `po/' directory get appended to +the `po/Makefile' when it is created. They present an opportunity to +add rules for special PO files to the Makefile, without needing to mess with `po/Makefile.in.in'. GNU gettext comes with a `Rules-quot' file, containing rules for @@ -8666,15 +9406,15 @@ similarly add `en@boldquot' to the `po/LINGUAS' file. Similarly, you can create rules for building message catalogs for the `sr@latin' locale - Serbian written with the Latin alphabet - from those for the `sr' locale - Serbian written with Cyrillic letters. See -*Note msgfilter Invocation::. +*note msgfilter Invocation::.  -File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Rules-*, Up: Adjusting Files +File: gettext.info, Node: configure.ac, Next: config.guess, Prev: po/Rules-*, Up: Adjusting Files -13.4.5 `configure.in' at top level +13.4.5 `configure.ac' at top level ---------------------------------- -`configure.in' or `configure.ac' - this is the source from which + `configure.ac' or `configure.in' - this is the source from which `autoconf' generates the `configure' script. 1. Declare the package and version. @@ -8682,7 +9422,7 @@ File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Rules-*, This is done by a set of lines like these: PACKAGE=gettext - VERSION=0.16 + VERSION=0.17 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -8690,17 +9430,17 @@ File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Rules-*, or, if you are using GNU `automake', by a line like this: - AM_INIT_AUTOMAKE(gettext, 0.16) + AM_INIT_AUTOMAKE(gettext, 0.17) Of course, you replace `gettext' with the name of your package, - and `0.16' by its version numbers, exactly as they should appear + and `0.17' by its version numbers, exactly as they should appear in the packaged `tar' file name of your distribution - (`gettext-0.16.tar.gz', here). + (`gettext-0.17.tar.gz', here). 2. Check for internationalization support. Here is the main `m4' macro for triggering internationalization - support. Just add this line to `configure.in': + support. Just add this line to `configure.ac': AM_GNU_GETTEXT @@ -8714,7 +9454,7 @@ File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Rules-*, 3. Have output files created. - The `AC_OUTPUT' directive, at the end of your `configure.in' file, + The `AC_OUTPUT' directive, at the end of your `configure.ac' file, needs to be modified in two ways: AC_OUTPUT([EXISTING CONFIGURATION FILES intl/Makefile po/Makefile.in], @@ -8749,16 +9489,16 @@ most likely very close to the `AC_PROG_CC' invocation. This is necessary because of ordering restrictions imposed by GNU autoconf.  -File: gettext.info, Node: config.guess, Next: mkinstalldirs, Prev: configure.in, Up: Adjusting Files +File: gettext.info, Node: config.guess, Next: mkinstalldirs, Prev: configure.ac, Up: Adjusting Files 13.4.6 `config.guess', `config.sub' at top level ------------------------------------------------ -If you haven't suppressed the `intl/' subdirectory, you need to add the -GNU `config.guess' and `config.sub' files to your distribution. They -are needed because the `intl/' directory has platform dependent support -for determining the locale's character encoding and therefore needs to -identify the platform. + If you haven't suppressed the `intl/' subdirectory, you need to add +the GNU `config.guess' and `config.sub' files to your distribution. +They are needed because the `intl/' directory has platform dependent +support for determining the locale's character encoding and therefore +needs to identify the platform. You can obtain the newest version of `config.guess' and `config.sub' from the CVS of the `config' project at `http://savannah.gnu.org/'. The @@ -8773,7 +9513,7 @@ of a distribution. But it is also possible to put them in a subdirectory, altogether with other configuration support files like `install-sh', `ltconfig', `ltmain.sh' or `missing'. All you need to do, other than moving the files, is to add the following line to your -`configure.in'. +`configure.ac'. AC_CONFIG_AUX_DIR([SUBDIR]) @@ -8783,7 +9523,7 @@ File: gettext.info, Node: mkinstalldirs, Next: aclocal, Prev: config.guess, 13.4.7 `mkinstalldirs' at top level ----------------------------------- -With earlier versions of GNU gettext, you needed to add the GNU + With earlier versions of GNU gettext, you needed to add the GNU `mkinstalldirs' script to your distribution. This is not needed any more. You can remove it if you not also using an automake version older than automake 1.9. @@ -8794,14 +9534,14 @@ File: gettext.info, Node: aclocal, Next: acconfig, Prev: mkinstalldirs, Up: 13.4.8 `aclocal.m4' at top level -------------------------------- -If you do not have an `aclocal.m4' file in your distribution, the + If you do not have an `aclocal.m4' file in your distribution, the simplest is to concatenate the files `codeset.m4', `gettext.m4', `glibc2.m4', `glibc21.m4', `iconv.m4', `intdiv0.m4', `intl.m4', -`intldir.m4', `intmax.m4', `inttypes_h.m4', `inttypes-pri.m4', -`lcmessage.m4', `lib-ld.m4', `lib-link.m4', `lib-prefix.m4', `lock.m4', -`longdouble.m4', `longlong.m4', `nls.m4', `po.m4', `printf-posix.m4', -`progtest.m4', `size_max.m4', `stdint_h.m4', `uintmax_t.m4', -`ulonglong.m4', `visibility.m4', `wchar_t.m4', `wint_t.m4', `xsize.m4' +`intldir.m4', `intlmacosx.m4', `intmax.m4', `inttypes_h.m4', +`inttypes-pri.m4', `lcmessage.m4', `lib-ld.m4', `lib-link.m4', +`lib-prefix.m4', `lock.m4', `longlong.m4', `nls.m4', `po.m4', +`printf-posix.m4', `progtest.m4', `size_max.m4', `stdint_h.m4', +`uintmax_t.m4', `visibility.m4', `wchar_t.m4', `wint_t.m4', `xsize.m4' from GNU `gettext''s `m4/' directory into a single file. If you have suppressed the `intl/' directory, only `gettext.m4', `iconv.m4', `lib-ld.m4', `lib-link.m4', `lib-prefix.m4', `nls.m4', `po.m4', @@ -8837,7 +9577,7 @@ File: gettext.info, Node: acconfig, Next: config.h.in, Prev: aclocal, Up: Ad 13.4.9 `acconfig.h' at top level -------------------------------- -Earlier GNU `gettext' releases required to put definitions for + Earlier GNU `gettext' releases required to put definitions for `ENABLE_NLS', `HAVE_GETTEXT' and `HAVE_LC_MESSAGES', `HAVE_STPCPY', `PACKAGE' and `VERSION' into an `acconfig.h' file. This is not needed any more; you can remove them from your `acconfig.h' file unless your @@ -8849,7 +9589,7 @@ File: gettext.info, Node: config.h.in, Next: Makefile, Prev: acconfig, Up: A 13.4.10 `config.h.in' at top level ---------------------------------- -The include file template that holds the C macros to be defined by + The include file template that holds the C macros to be defined by `configure' is usually called `config.h.in' and may be maintained either manually or automatically. @@ -8884,7 +9624,7 @@ File: gettext.info, Node: Makefile, Next: src/Makefile, Prev: config.h.in, U 13.4.11 `Makefile.in' at top level ---------------------------------- -Here are a few modifications you need to make to your main, top-level + Here are a few modifications you need to make to your main, top-level `Makefile.in' file. 1. Add the following lines near the beginning of your `Makefile.in', @@ -8950,10 +9690,10 @@ File: gettext.info, Node: src/Makefile, Next: lib/gettext.h, Prev: Makefile, 13.4.12 `Makefile.in' in `src/' ------------------------------- -Some of the modifications made in the main `Makefile.in' will also be -needed in the `Makefile.in' from your package sources, which we assume -here to be in the `src/' subdirectory. Here are all the modifications -needed in `src/Makefile.in': + Some of the modifications made in the main `Makefile.in' will also +be needed in the `Makefile.in' from your package sources, which we +assume here to be in the `src/' subdirectory. Here are all the +modifications needed in `src/Makefile.in': 1. In view of the `dist:' goal, you should have these lines near the beginning of `src/Makefile.in': @@ -9069,7 +9809,7 @@ File: gettext.info, Node: lib/gettext.h, Prev: src/Makefile, Up: Adjusting Fi 13.4.13 `gettext.h' in `lib/' ----------------------------- -Internationalization of packages, as provided by GNU `gettext', is + Internationalization of packages, as provided by GNU `gettext', is optional. It can be turned off in two situations: * When the installer has specified `./configure --disable-nls'. This @@ -9117,12 +9857,12 @@ package that needs it should contain a copy of it on its own.  File: gettext.info, Node: autoconf macros, Next: CVS Issues, Prev: Adjusting Files, Up: Maintainers -13.5 Autoconf macros for use in `configure.in' +13.5 Autoconf macros for use in `configure.ac' ============================================== -GNU `gettext' installs macros for use in a package's `configure.in' or -`configure.ac'. *Note Introduction: (autoconf)Top. The primary macro -is, of course, `AM_GNU_GETTEXT'. + GNU `gettext' installs macros for use in a package's `configure.ac' +or `configure.in'. *Note Introduction: (autoconf)Top. The primary +macro is, of course, `AM_GNU_GETTEXT'. * Menu: @@ -9131,6 +9871,7 @@ is, of course, `AM_GNU_GETTEXT'. * AM_GNU_GETTEXT_NEED:: AM_GNU_GETTEXT_NEED in `gettext.m4' * AM_GNU_GETTEXT_INTL_SUBDIR:: AM_GNU_GETTEXT_INTL_SUBDIR in `intldir.m4' * AM_PO_SUBDIRS:: AM_PO_SUBDIRS in `po.m4' +* AM_XGETTEXT_OPTION:: AM_XGETTEXT_OPTION in `po.m4' * AM_ICONV:: AM_ICONV in `iconv.m4'  @@ -9139,7 +9880,7 @@ File: gettext.info, Node: AM_GNU_GETTEXT, Next: AM_GNU_GETTEXT_VERSION, Prev: 13.5.1 AM_GNU_GETTEXT in `gettext.m4' ------------------------------------- -The `AM_GNU_GETTEXT' macro tests for the presence of the GNU gettext + The `AM_GNU_GETTEXT' macro tests for the presence of the GNU gettext function family in either the C library or a separate `libintl' library (shared or static libraries are both supported) or in the package's `intl/' directory. It also invokes `AM_PO_SUBDIRS', thus preparing the @@ -9218,8 +9959,8 @@ File: gettext.info, Node: AM_GNU_GETTEXT_VERSION, Next: AM_GNU_GETTEXT_NEED, 13.5.2 AM_GNU_GETTEXT_VERSION in `gettext.m4' --------------------------------------------- -The `AM_GNU_GETTEXT_VERSION' macro declares the version number of the -GNU gettext infrastructure that is used by the package. + The `AM_GNU_GETTEXT_VERSION' macro declares the version number of +the GNU gettext infrastructure that is used by the package. The use of this macro is optional; only the `autopoint' program makes use of it (*note CVS Issues::). @@ -9230,8 +9971,8 @@ File: gettext.info, Node: AM_GNU_GETTEXT_NEED, Next: AM_GNU_GETTEXT_INTL_SUBDI 13.5.3 AM_GNU_GETTEXT_NEED in `gettext.m4' ------------------------------------------ -The `AM_GNU_GETTEXT_NEED' macro declares a constraint regarding the GNU -gettext implementation. The syntax is + The `AM_GNU_GETTEXT_NEED' macro declares a constraint regarding the +GNU gettext implementation. The syntax is AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) @@ -9253,7 +9994,7 @@ File: gettext.info, Node: AM_GNU_GETTEXT_INTL_SUBDIR, Next: AM_PO_SUBDIRS, Pr 13.5.4 AM_GNU_GETTEXT_INTL_SUBDIR in `intldir.m4' ------------------------------------------------- -The `AM_GNU_GETTEXT_INTL_SUBDIR' macro specifies that the + The `AM_GNU_GETTEXT_INTL_SUBDIR' macro specifies that the `AM_GNU_GETTEXT' macro, although invoked with the first argument `external', should also prepare for building the `intl/' subdirectory. @@ -9264,17 +10005,17 @@ the `AM_GNU_GETTEXT' invocation; the order doesn't matter. autoconf 2.61 or newer.  -File: gettext.info, Node: AM_PO_SUBDIRS, Next: AM_ICONV, Prev: AM_GNU_GETTEXT_INTL_SUBDIR, Up: autoconf macros +File: gettext.info, Node: AM_PO_SUBDIRS, Next: AM_XGETTEXT_OPTION, Prev: AM_GNU_GETTEXT_INTL_SUBDIR, Up: autoconf macros 13.5.5 AM_PO_SUBDIRS in `po.m4' ------------------------------- -The `AM_PO_SUBDIRS' macro prepares the `po/' directories of the package -for building. This macro should be used in internationalized programs -written in other programming languages than C, C++, Objective C, for -example `sh', `Python', `Lisp'. See *Note Programming Languages:: for -a list of programming languages that support localization through PO -files. + The `AM_PO_SUBDIRS' macro prepares the `po/' directories of the +package for building. This macro should be used in internationalized +programs written in other programming languages than C, C++, Objective +C, for example `sh', `Python', `Lisp'. See *note Programming +Languages:: for a list of programming languages that support +localization through PO files. The `AM_PO_SUBDIRS' macro determines whether internationalization should be used. If so, it sets the `USE_NLS' variable to `yes', @@ -9282,12 +10023,34 @@ otherwise to `no'. It also determines the right values for Makefile variables in each `po/' directory.  -File: gettext.info, Node: AM_ICONV, Prev: AM_PO_SUBDIRS, Up: autoconf macros +File: gettext.info, Node: AM_XGETTEXT_OPTION, Next: AM_ICONV, Prev: AM_PO_SUBDIRS, Up: autoconf macros + +13.5.6 AM_XGETTEXT_OPTION in `po.m4' +------------------------------------ + + The `AM_XGETTEXT_OPTION' macro registers a command-line option to be +used in the invocations of `xgettext' in the `po/' directories of the +package. + + For example, if you have a source file that defines a function +`error_at_line' whose fifth argument is a format string, you can use + AM_XGETTEXT_OPTION([--flag=error_at_line:5:c-format]) + to instruct `xgettext' to mark all translatable strings in `gettext' +invocations that occur as fifth argument to this function as `c-format'. + + See *note xgettext Invocation:: for the list of options that +`xgettext' accepts. + + The use of this macro is an alternative to the use of the +`XGETTEXT_OPTIONS' variable in `po/Makevars'. + + +File: gettext.info, Node: AM_ICONV, Prev: AM_XGETTEXT_OPTION, Up: autoconf macros -13.5.6 AM_ICONV in `iconv.m4' +13.5.7 AM_ICONV in `iconv.m4' ----------------------------- -The `AM_ICONV' macro tests for the presence of the POSIX/XSI `iconv' + The `AM_ICONV' macro tests for the presence of the POSIX/XSI `iconv' function family in either the C library or a separate `libiconv' library. If found, it sets the `am_cv_func_iconv' variable to `yes'; it defines `HAVE_ICONV' to 1 in the autoconf generated configuration @@ -9333,9 +10096,9 @@ File: gettext.info, Node: CVS Issues, Next: Release Management, Prev: autocon 13.6 Integrating with CVS ========================= -Many projects use CVS for distributed development, version control and -source backup. This section gives some advice how to manage the uses -of `cvs', `gettextize', `autopoint' and `autoconf'. + Many projects use CVS for distributed development, version control +and source backup. This section gives some advice how to manage the +uses of `cvs', `gettextize', `autopoint' and `autoconf'. * Menu: @@ -9349,10 +10112,10 @@ File: gettext.info, Node: Distributed CVS, Next: Files under CVS, Prev: CVS I 13.6.1 Avoiding version mismatch in distributed development ----------------------------------------------------------- -In a project development with multiple developers, using CVS, there + In a project development with multiple developers, using CVS, there should be a single developer who occasionally - when there is desire to upgrade to a new `gettext' version - runs `gettextize' and performs the -changes listed in *Note Adjusting Files::, and then commits his changes +changes listed in *note Adjusting Files::, and then commits his changes to the CVS. It is highly recommended that all developers on a project use the @@ -9362,7 +10125,7 @@ necessary remaining changes and commit his changes to the CVS. Otherwise the following damages will likely occur: * Apparent version mismatch between developers. Since some `gettext' - specific portions in `configure.in', `configure.ac' and + specific portions in `configure.ac', `configure.in' and `Makefile.am', `Makefile.in' files depend on the `gettext' version, the use of infrastructure files belonging to different `gettext' versions can easily lead to build errors. @@ -9386,9 +10149,9 @@ File: gettext.info, Node: Files under CVS, Next: autopoint Invocation, Prev: 13.6.2 Files to put under CVS version control --------------------------------------------- -There are basically three ways to deal with generated files in the + There are basically three ways to deal with generated files in the context of a CVS repository, such as `configure' generated from -`configure.in', `PARSER.c' generated from `PARSER.y', or +`configure.ac', `PARSER.c' generated from `PARSER.y', or `po/Makefile.in.in' autoinstalled by `gettextize' or `autopoint'. 1. All generated files are always committed into the repository. @@ -9427,10 +10190,10 @@ committed into the CVS. For the third approach, the maintainer can omit from the CVS repository all the files that `gettextize' mentions as "copy". -Instead, he adds to the `configure.in' or `configure.ac' a line of the +Instead, he adds to the `configure.ac' or `configure.in' a line of the form - AM_GNU_GETTEXT_VERSION(0.16) + AM_GNU_GETTEXT_VERSION(0.17) and adds to the package's pre-build script an invocation of `autopoint'. For everyone who checks out the CVS, this `autopoint' @@ -9489,8 +10252,8 @@ into the package. `autopoint' supports the GNU `gettext' versions from 0.10.35 to the -current one, 0.16. In order to apply `autopoint' to a package using a -`gettext' version newer than 0.16, you need to install this same +current one, 0.17. In order to apply `autopoint' to a package using a +`gettext' version newer than 0.17, you need to install this same version of GNU `gettext' at least. In packages using GNU `automake', an invocation of `autopoint' @@ -9511,8 +10274,8 @@ File: gettext.info, Node: Release Management, Prev: CVS Issues, Up: Maintaine 13.7 Creating a Distribution Tarball ==================================== -In projects that use GNU `automake', the usual commands for creating a -distribution tarball, `make dist' or `make distcheck', automatically + In projects that use GNU `automake', the usual commands for creating +a distribution tarball, `make dist' or `make distcheck', automatically update the PO files as needed. If GNU `automake' is not used, the maintainer needs to perform this @@ -9528,7 +10291,7 @@ File: gettext.info, Node: Installers, Next: Programming Languages, Prev: Main 14 The Installer's and Distributor's View ***************************************** -By default, packages fully using GNU `gettext', internally, are + By default, packages fully using GNU `gettext', internally, are installed in such a way that they to allow translation of messages. At _configuration_ time, those packages should automatically detect whether the underlying host system already provides the GNU `gettext' @@ -9552,10 +10315,10 @@ File: gettext.info, Node: Programming Languages, Next: Conclusion, Prev: Inst 15 Other Programming Languages ****************************** -While the presentation of `gettext' focuses mostly on C and implicitly -applies to C++ as well, its scope is far broader than that: Many -programming languages, scripting languages and other textual data like -GUI resources or package descriptions can make use of the gettext + While the presentation of `gettext' focuses mostly on C and +implicitly applies to C++ as well, its scope is far broader than that: +Many programming languages, scripting languages and other textual data +like GUI resources or package descriptions can make use of the gettext approach. * Menu: @@ -9573,9 +10336,9 @@ File: gettext.info, Node: Language Implementors, Next: Programmers for other L 15.1 The Language Implementor's View ==================================== -All programming and scripting languages that have the notion of strings -are eligible to supporting `gettext'. Supporting `gettext' means the -following: + All programming and scripting languages that have the notion of +strings are eligible to supporting `gettext'. Supporting `gettext' +means the following: 1. You should add to the language a syntax for translatable strings. In principle, a function call of `gettext' would do, but a @@ -9591,11 +10354,11 @@ following: `dcngettext' available from within the language. These functions are less often used, but are nevertheless necessary for particular purposes: `ngettext' for correct plural handling, and `dcgettext' - and `dcngettext' for obeying other locale environment variables - than `LC_MESSAGES', such as `LC_TIME' or `LC_MONETARY'. For these - latter functions, you need to make the `LC_*' constants, available - in the C header `', referenceable from within the - language, usually either as enumeration values or as strings. + and `dcngettext' for obeying other locale-related environment + variables than `LC_MESSAGES', such as `LC_TIME' or `LC_MONETARY'. + For these latter functions, you need to make the `LC_*' constants, + available in the C header `', referenceable from within + the language, usually either as enumeration values or as strings. 4. You should allow the programmer to designate a message domain, either by making the `textdomain' function available from within @@ -9607,7 +10370,7 @@ following: 5. You should either perform a `setlocale (LC_ALL, "")' call during the startup of your language runtime, or allow the programmer to do so. Remember that gettext will act as a no-op if the - `LC_MESSAGES' and `LC_CTYPE' locale facets are not both set. + `LC_MESSAGES' and `LC_CTYPE' locale categories are not both set. 6. A programmer should have a way to extract translatable strings from a program into a PO file. The GNU `xgettext' program is being @@ -9640,7 +10403,7 @@ following: different effects on portability and copyright: * You may integrate the GNU `gettext''s `intl/' directory in your - package, as described in *Note Maintainers::. This allows you to + package, as described in *note Maintainers::. This allows you to have internationalization on all kinds of platforms. Note that when you then distribute your package, it legally falls under the GNU General Public License, and the GNU project will be glad about @@ -9665,7 +10428,7 @@ File: gettext.info, Node: Programmers for other Languages, Next: Translators f 15.2 The Programmer's View ========================== -For the programmer, the general procedure is the same as for the C + For the programmer, the general procedure is the same as for the C language. The Emacs PO mode marking supports other languages, and the GNU `xgettext' string extractor recognizes other languages based on the file extension or a command-line option. In some languages, @@ -9678,7 +10441,7 @@ File: gettext.info, Node: Translators for other Languages, Next: Maintainers f 15.3 The Translator's View ========================== -The translator works exactly as in the C language case. The only + The translator works exactly as in the C language case. The only difference is that when translating format strings, she has to be aware of the language's particular syntax for positional arguments in format strings. @@ -9704,6 +10467,7 @@ strings. * php-format:: PHP Format Strings * gcc-internal-format:: GCC internal Format Strings * qt-format:: Qt Format Strings +* kde-format:: KDE Format Strings * boost-format:: Boost Format Strings  @@ -9712,7 +10476,7 @@ File: gettext.info, Node: c-format, Next: objc-format, Prev: Translators for 15.3.1 C Format Strings ----------------------- -C format strings are described in POSIX (IEEE P1003.1 2001), section + C format strings are described in POSIX (IEEE P1003.1 2001), section XSH 3 fprintf(), `http://www.opengroup.org/onlinepubs/007904975/functions/fprintf.html'. See also the fprintf() manual page, @@ -9739,7 +10503,7 @@ translators can insert an `I' flag into numeric format directives. For example, the translation of `"%d"' can be `"%Id"'. The effect of this flag, on systems with GNU `libc', is that in the output, the ASCII digits are replaced with the `outdigits' defined in the `LC_CTYPE' -locale facet. On other systems, the `gettext' function removes this +locale category. On other systems, the `gettext' function removes this flag, so that it has no effect. Note that the programmer should _not_ put this flag into the @@ -9753,8 +10517,8 @@ File: gettext.info, Node: objc-format, Next: sh-format, Prev: c-format, Up: 15.3.2 Objective C Format Strings --------------------------------- -Objective C format strings are like C format strings. They support an -additional format directive: "$@", which when executed consumes an + Objective C format strings are like C format strings. They support +an additional format directive: "$@", which when executed consumes an argument of type `Object *'.  @@ -9763,7 +10527,7 @@ File: gettext.info, Node: sh-format, Next: python-format, Prev: objc-format, 15.3.3 Shell Format Strings --------------------------- -Shell format strings, as supported by GNU gettext and the `envsubst' + Shell format strings, as supported by GNU gettext and the `envsubst' program, are strings with references to shell variables in the form `$VARIABLE' or `${VARIABLE}'. References of the form `${VARIABLE-DEFAULT}', `${VARIABLE:-DEFAULT}', `${VARIABLE=DEFAULT}', @@ -9780,7 +10544,7 @@ File: gettext.info, Node: python-format, Next: lisp-format, Prev: sh-format, 15.3.4 Python Format Strings ---------------------------- -Python format strings are described in Python Library reference / + Python format strings are described in Python Library reference / 2. Built-in Types, Exceptions and Functions / 2.2. Built-in Types / 2.2.6. Sequence Types / 2.2.6.2. String Formatting Operations. `http://www.python.org/doc/2.2.1/lib/typesseq-strings.html'. @@ -9791,8 +10555,8 @@ File: gettext.info, Node: lisp-format, Next: elisp-format, Prev: python-forma 15.3.5 Lisp Format Strings -------------------------- -Lisp format strings are described in the Common Lisp HyperSpec, chapter -22.3 Formatted Output, + Lisp format strings are described in the Common Lisp HyperSpec, +chapter 22.3 Formatted Output, `http://www.lisp.org/HyperSpec/Body/sec_22-3.html'.  @@ -9801,7 +10565,7 @@ File: gettext.info, Node: elisp-format, Next: librep-format, Prev: lisp-forma 15.3.6 Emacs Lisp Format Strings -------------------------------- -Emacs Lisp format strings are documented in the Emacs Lisp reference, + Emacs Lisp format strings are documented in the Emacs Lisp reference, section Formatting Strings, `http://www.gnu.org/manual/elisp-manual-21-2.8/html_chapter/elisp_4.html#SEC75'. Note that as of version 21, XEmacs supports numbered argument @@ -9813,7 +10577,7 @@ File: gettext.info, Node: librep-format, Next: scheme-format, Prev: elisp-for 15.3.7 librep Format Strings ---------------------------- -librep format strings are documented in the librep manual, section + librep format strings are documented in the librep manual, section Formatted Output, `http://librep.sourceforge.net/librep-manual.html#Formatted%20Output', `http://www.gwinnup.org/research/docs/librep.html#SEC122'. @@ -9824,7 +10588,7 @@ File: gettext.info, Node: scheme-format, Next: smalltalk-format, Prev: librep 15.3.8 Scheme Format Strings ---------------------------- -Scheme format strings are documented in the SLIB manual, section + Scheme format strings are documented in the SLIB manual, section Format Specification.  @@ -9833,7 +10597,7 @@ File: gettext.info, Node: smalltalk-format, Next: java-format, Prev: scheme-f 15.3.9 Smalltalk Format Strings ------------------------------- -Smalltalk format strings are described in the GNU Smalltalk + Smalltalk format strings are described in the GNU Smalltalk documentation, class `CharArray', methods `bindWith:' and `bindWithArguments:'. `http://www.gnu.org/software/smalltalk/gst-manual/gst_68.html#SEC238'. @@ -9846,7 +10610,7 @@ File: gettext.info, Node: java-format, Next: csharp-format, Prev: smalltalk-f 15.3.10 Java Format Strings --------------------------- -Java format strings are described in the JDK documentation for class + Java format strings are described in the JDK documentation for class `java.text.MessageFormat', `http://java.sun.com/j2se/1.4/docs/api/java/text/MessageFormat.html'. See also the ICU documentation @@ -9858,7 +10622,7 @@ File: gettext.info, Node: csharp-format, Next: awk-format, Prev: java-format, 15.3.11 C# Format Strings ------------------------- -C# format strings are described in the .NET documentation for class + C# format strings are described in the .NET documentation for class `System.String' and in `http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpguide/html/cpConFormattingOverview.asp'. @@ -9868,7 +10632,7 @@ File: gettext.info, Node: awk-format, Next: object-pascal-format, Prev: cshar 15.3.12 awk Format Strings -------------------------- -awk format strings are described in the gawk documentation, section + awk format strings are described in the gawk documentation, section Printf, `http://www.gnu.org/manual/gawk/html_node/Printf.html#Printf'.  @@ -9877,7 +10641,7 @@ File: gettext.info, Node: object-pascal-format, Next: ycp-format, Prev: awk-f 15.3.13 Object Pascal Format Strings ------------------------------------ -Where is this documented? + Where is this documented?  File: gettext.info, Node: ycp-format, Next: tcl-format, Prev: object-pascal-format, Up: Translators for other Languages @@ -9885,7 +10649,7 @@ File: gettext.info, Node: ycp-format, Next: tcl-format, Prev: object-pascal-f 15.3.14 YCP Format Strings -------------------------- -YCP sformat strings are described in the libycp documentation + YCP sformat strings are described in the libycp documentation `file:/usr/share/doc/packages/libycp/YCP-builtins.html'. In summary, a directive starts with `%' and is followed by `%' or a nonzero digit (`1' to `9'). @@ -9896,7 +10660,7 @@ File: gettext.info, Node: tcl-format, Next: perl-format, Prev: ycp-format, U 15.3.15 Tcl Format Strings -------------------------- -Tcl format strings are described in the `format.n' manual page, + Tcl format strings are described in the `format.n' manual page, `http://www.scriptics.com/man/tcl8.3/TclCmd/format.htm'.  @@ -9905,7 +10669,7 @@ File: gettext.info, Node: perl-format, Next: php-format, Prev: tcl-format, U 15.3.16 Perl Format Strings --------------------------- -There are two kinds format strings in Perl: those acceptable to the + There are two kinds format strings in Perl: those acceptable to the Perl built-in function `printf', labelled as `perl-format', and those acceptable to the `libintl-perl' function `__x', labelled as `perl-brace-format'. @@ -9924,7 +10688,7 @@ File: gettext.info, Node: php-format, Next: gcc-internal-format, Prev: perl-f 15.3.17 PHP Format Strings -------------------------- -PHP format strings are described in the documentation of the PHP + PHP format strings are described in the documentation of the PHP function `sprintf', in `phpdoc/manual/function.sprintf.html' or `http://www.php.net/manual/en/function.sprintf.php'. @@ -9934,10 +10698,10 @@ File: gettext.info, Node: gcc-internal-format, Next: qt-format, Prev: php-for 15.3.18 GCC internal Format Strings ----------------------------------- -These format strings are used inside the GCC sources. In such a format -string, a directive starts with `%', is optionally followed by a size -specifier `l', an optional flag `+', another optional flag `#', and is -finished by a specifier: `%' denotes a literal percent sign, `c' + These format strings are used inside the GCC sources. In such a +format string, a directive starts with `%', is optionally followed by a +size specifier `l', an optional flag `+', another optional flag `#', +and is finished by a specifier: `%' denotes a literal percent sign, `c' denotes a character, `s' denotes a string, `i' and `d' denote an integer, `o', `u', `x' denote an unsigned integer, `.*s' denotes a string preceded by a width specification, `H' denotes a `location_t *' @@ -9949,23 +10713,34 @@ function parameter, `Q' denotes an assignment operator, `V' denotes a const/volatile qualifier.  -File: gettext.info, Node: qt-format, Next: boost-format, Prev: gcc-internal-format, Up: Translators for other Languages +File: gettext.info, Node: qt-format, Next: kde-format, Prev: gcc-internal-format, Up: Translators for other Languages 15.3.19 Qt Format Strings ------------------------- -Qt format strings are described in the documentation of the QString -class `file:/usr/lib/qt-3.0.5/doc/html/qstring.html'. In summary, a + Qt format strings are described in the documentation of the QString +class `file:/usr/lib/qt-4.3.0/doc/html/qstring.html'. In summary, a directive consists of a `%' followed by a digit. The same directive cannot occur more than once in a format string.  -File: gettext.info, Node: boost-format, Prev: qt-format, Up: Translators for other Languages +File: gettext.info, Node: kde-format, Next: boost-format, Prev: qt-format, Up: Translators for other Languages + +15.3.20 KDE Format Strings +-------------------------- + + KDE 4 format strings are defined as follows: A directive consists of +a `%' followed by a non-zero decimal number. If a `%n' occurs in a +format strings, all of `%1', ..., `%(n-1)' must occur as well, except +possibly one of them. + + +File: gettext.info, Node: boost-format, Prev: kde-format, Up: Translators for other Languages -15.3.20 Boost Format Strings +15.3.21 Boost Format Strings ---------------------------- -Boost format strings are described in the documentation of the + Boost format strings are described in the documentation of the `boost::format' class, at `http://www.boost.org/libs/format/doc/format.html'. In summary, a directive has either the same syntax as in a C format string, such as @@ -9979,7 +10754,7 @@ File: gettext.info, Node: Maintainers for other Languages, Next: List of Progr 15.4 The Maintainer's View ========================== -For the maintainer, the general procedure differs from the C language + For the maintainer, the general procedure differs from the C language case in two ways. * For those languages that don't use GNU gettext, the `intl/' @@ -10156,8 +10931,8 @@ File: gettext.info, Node: Preparing Shell Scripts, Next: gettext.sh, Prev: sh 15.5.2.1 Preparing Shell Scripts for Internationalization ......................................................... -Preparing a shell script for internationalization is conceptually -similar to the steps described in *Note Sources::. The concrete steps + Preparing a shell script for internationalization is conceptually +similar to the steps described in *note Sources::. The concrete steps for shell scripts are as follows. 1. Insert the line @@ -10165,8 +10940,8 @@ for shell scripts are as follows. . gettext.sh near the top of the script. `gettext.sh' is a shell function - library that provides the functions `eval_gettext' (see *Note - eval_gettext Invocation::) and `eval_ngettext' (see *Note + library that provides the functions `eval_gettext' (see *note + eval_gettext Invocation::) and `eval_ngettext' (see *note eval_ngettext Invocation::). You have to ensure that `gettext.sh' can be found in the `PATH'. @@ -10181,7 +10956,7 @@ for shell scripts are as follows. TEXTDOMAINDIR=@LOCALEDIR@ export TEXTDOMAINDIR - 3. Prepare the strings for translation, as described in *Note + 3. Prepare the strings for translation, as described in *note Preparing Strings::. 4. Simplify translatable strings so that they don't contain command @@ -10250,16 +11025,16 @@ File: gettext.info, Node: gettext.sh, Next: gettext Invocation, Prev: Prepari 15.5.2.2 Contents of `gettext.sh' ................................. -`gettext.sh', contained in the run-time package of GNU gettext, provides -the following: + `gettext.sh', contained in the run-time package of GNU gettext, +provides the following: * $echo The variable `echo' is set to a command that outputs its first argument and a newline, without interpreting backslashes in the argument string. - * eval_gettext See *Note eval_gettext Invocation::. + * eval_gettext See *note eval_gettext Invocation::. - * eval_ngettext See *Note eval_ngettext Invocation::. + * eval_ngettext See *note eval_ngettext Invocation::.  File: gettext.info, Node: gettext Invocation, Next: ngettext Invocation, Prev: gettext.sh, Up: sh @@ -10448,7 +11223,7 @@ File: gettext.info, Node: bash, Next: Python, Prev: sh, Up: List of Programm 15.5.3 bash - Bourne-Again Shell Script --------------------------------------- -GNU `bash' 2.0 or newer has a special shorthand for translating a + GNU `bash' 2.0 or newer has a special shorthand for translating a string and substituting variable values in it: `$"msgid"'. But the use of this construct is *discouraged*, due to the security holes it opens and due to its portability problems. @@ -10860,7 +11635,8 @@ gettext shorthand _("abc") gettext/ngettext functions - `GettextResource.gettext', `GettextResource.ngettext' + `GettextResource.gettext', `GettextResource.ngettext', + `GettextResource.pgettext', `GettextResource.npgettext' textdomain --, use `ResourceBundle.getResource' instead @@ -10935,21 +11711,22 @@ ResourceBundles, whether GNU gettext generated classes, or other 2. The `gnu.gettext.GettextResource' API. Reference documentation in Javadoc 1.1 style format is in the - javadoc1 directory (javadoc1/tree.html) and in Javadoc 2 style - format in the javadoc2 directory (javadoc2/index.html). + javadoc2 directory (javadoc2/index.html). Its `gettext' function returns a string translation. Note that when a translation is missing, the MSGID argument is returned unchanged. This has the advantage of having the `ngettext' function for plural - handling. + handling and the `pgettext' and `npgettext' for strings constraint + to a particular context. To use this API, one needs the `libintl.jar' file which is part of the GNU gettext package and distributed under the LGPL. - Three examples, using the second API, are available in the `examples' -directory: `hello-java', `hello-java-awt', `hello-java-swing'. + Four examples, using the second API, are available in the `examples' +directory: `hello-java', `hello-java-awt', `hello-java-swing', +`hello-java-qtjambi'. Now, to make use of the API and define a shorthand for `getString', there are three idioms that you can choose from: @@ -11028,6 +11805,8 @@ gettext shorthand gettext/ngettext functions `GettextResourceManager.GetString', `GettextResourceManager.GetPluralString' + `GettextResourceManager.GetParticularString' + `GettextResourceManager.GetParticularPluralString' textdomain `new GettextResourceManager(domain)' @@ -11120,7 +11899,13 @@ can be used with the option `--csharp'. files can only contain data and only support lookups that depend on a single string. - 3. The `GettextResourceManager' that loads the message catalogs in + 3. Context handling: A message catalog in `.dll' format supports the + query-with-context functions `GetParticularString' and + `GetParticularPluralString'. Whereas `.resources' files can only + contain data and only support lookups that depend on a single + string. + + 4. The `GettextResourceManager' that loads the message catalogs in `.dll' format also provides for inheritance on a per-message basis. For example, in Austrian (`de_AT') locale, translations from the German (`de') message catalog will be used for messages not found @@ -11130,7 +11915,7 @@ can be used with the option `--csharp'. one. Whereas when working with `.resources' files, each message catalog must provide the translations of all messages by itself. - 4. The `GettextResourceManager' that loads the message catalogs in + 5. The `GettextResourceManager' that loads the message catalogs in `.dll' format also provides for a fallback: The English MSGID is returned when no translation can be found. Whereas when working with `.resources' files, a language-neutral `.resources' file must @@ -11168,6 +11953,15 @@ API. The latter is an extension of the former, because The `GetPluralString' function returns a string translation with plural handling, like the `ngettext' function in C. + The `GetParticularString' function returns a string's translation, + specific to a particular context, like the `pgettext' function in + C. Note that when a translation is missing, the MSGID argument is + returned unchanged. + + The `GetParticularPluralString' function returns a string + translation, specific to a particular context, with plural + handling, like the `npgettext' function in C. + To use this API, one needs the `GNU.Gettext.dll' file which is part of the GNU gettext package and distributed under the LGPL. @@ -11607,7 +12401,7 @@ File: gettext.info, Node: General Problems, Next: Default Keywords, Up: Perl 15.5.18.1 General Problems Parsing Perl Code ............................................ -It is often heard that only Perl can parse Perl. This is not true. + It is often heard that only Perl can parse Perl. This is not true. Perl cannot be _parsed_ at all, it can only be _executed_. Perl has various built-in ambiguities that can only be resolved at runtime. @@ -11702,9 +12496,9 @@ File: gettext.info, Node: Default Keywords, Next: Special Keywords, Prev: Gen 15.5.18.2 Which keywords will xgettext look for? ................................................ -Unless you instruct `xgettext' otherwise by invoking it with one of the -options `--keyword' or `-k', it will recognize the following keywords -in your Perl sources: + Unless you instruct `xgettext' otherwise by invoking it with one of +the options `--keyword' or `-k', it will recognize the following +keywords in your Perl sources: * `gettext' @@ -11745,8 +12539,8 @@ File: gettext.info, Node: Special Keywords, Next: Quote-like Expressions, Pre 15.5.18.3 How to Extract Hash Keys .................................. -Translating messages at runtime is normally performed by looking up the -original string in the translation database and returning the + Translating messages at runtime is normally performed by looking up +the original string in the translation database and returning the translated version. The "natural" Perl implementation is a hash lookup, and, of course, `xgettext' supports such practice. @@ -11781,8 +12575,8 @@ File: gettext.info, Node: Quote-like Expressions, Next: Interpolation I, Prev 15.5.18.4 What are Strings And Quote-like Expressions? ...................................................... -Perl offers a plethora of different string constructs. Those that can -be used either as arguments to functions or inside braces for hash + Perl offers a plethora of different string constructs. Those that +can be used either as arguments to functions or inside braces for hash lookups are generally supported by `xgettext'. * *double-quoted strings* @@ -11846,7 +12640,7 @@ File: gettext.info, Node: Interpolation I, Next: Interpolation II, Prev: Quot 15.5.18.5 Invalid Uses Of String Interpolation .............................................. -Perl is capable of interpolating variables into strings. This offers + Perl is capable of interpolating variables into strings. This offers some nice features in localized programs but can also lead to problems. A common error is a construct like the following: @@ -11874,8 +12668,8 @@ what you are doing, you can always circumvent this behavior: Since the parser only recognizes strings and quote-like expressions, but not variables or other terms, the above construct will be accepted. -You will have to find another way, however, to let your original -string make it into your message catalog. +You will have to find another way, however, to let your original string +make it into your message catalog. If invoked with the option `--extract-all', resp. `-a', variable interpolation will be accepted. Rationale: You will generally use this @@ -11938,9 +12732,9 @@ File: gettext.info, Node: Interpolation II, Next: Parentheses, Prev: Interpol 15.5.18.6 Valid Uses Of String Interpolation ............................................ -Perl is often used to generate sources for other programming languages -or arbitrary file formats. Web applications that output HTML code make -a prominent example for such usage. + Perl is often used to generate sources for other programming +languages or arbitrary file formats. Web applications that output HTML +code make a prominent example for such usage. You will often come across situations where you want to intersperse code written in the target (programming) language with translatable @@ -12000,7 +12794,7 @@ File: gettext.info, Node: Parentheses, Next: Long Lines, Prev: Interpolation 15.5.18.7 When To Use Parentheses ................................. -In Perl, parentheses around function arguments are mostly optional. + In Perl, parentheses around function arguments are mostly optional. `xgettext' will always assume that all recognized keywords (except for hashes and hash references) are names of properly prototyped functions, and will (hopefully) only require parentheses where Perl itself @@ -12040,7 +12834,7 @@ File: gettext.info, Node: Long Lines, Next: Perl Pitfalls, Prev: Parentheses, 15.5.18.8 How To Grok with Long Lines ..................................... -The necessity of long messages can often lead to a cumbersome or + The necessity of long messages can often lead to a cumbersome or unreadable coding style. Perl has several options that may prevent you from writing unreadable code, and `xgettext' does its best to do likewise. This is where the dot operator (the string concatenation @@ -12090,7 +12884,7 @@ File: gettext.info, Node: Perl Pitfalls, Prev: Long Lines, Up: Perl 15.5.18.9 Bugs, Pitfalls, And Things That Do Not Work ..................................................... -The foregoing sections should have proven that `xgettext' is quite + The foregoing sections should have proven that `xgettext' is quite smart in extracting translatable strings from Perl sources. Yet, some more or less exotic constructs that could be expected to work, actually do not work. @@ -12336,7 +13130,7 @@ File: gettext.info, Node: List of Data Formats, Prev: List of Programming Lang 15.6 Internationalizable Data ============================= -Here is a list of other data formats which can be internationalized + Here is a list of other data formats which can be internationalized using GNU gettext. * Menu: @@ -12397,7 +13191,7 @@ File: gettext.info, Node: Conclusion, Next: Language Codes, Prev: Programming 16 Concluding Remarks ********************* -We would like to conclude this GNU `gettext' manual by presenting an + We would like to conclude this GNU `gettext' manual by presenting an history of the Translation Project so far. We finally give a few pointers for those who want to do further research or readings about Native Language Support matters. @@ -12413,11 +13207,11 @@ File: gettext.info, Node: History, Next: References, Prev: Conclusion, Up: C 16.1 History of GNU `gettext' ============================= -Internationalization concerns and algorithms have been informally and -casually discussed for years in GNU, sometimes around GNU `libc', maybe -around the incoming `Hurd', or otherwise (nobody clearly remembers). -And even then, when the work started for real, this was somewhat -independently of these previous discussions. + Internationalization concerns and algorithms have been informally +and casually discussed for years in GNU, sometimes around GNU `libc', +maybe around the incoming `Hurd', or otherwise (nobody clearly +remembers). And even then, when the work started for real, this was +somewhat independently of these previous discussions. This all began in July 1994, when Patrick D'Cruze had the idea and initiative of internationalizing version 3.9.2 of GNU `fileutils'. He @@ -12433,7 +13227,7 @@ what was meant to become `glocale', at that time. Jim implemented `glocale' and got a lot of exhausting feedback from Patrick and Richard, of course, but also from Mitchum DSouza (who wrote a `catgets'-like package), Roland McGrath, maybe David MacKenzie, -Franc,ois Pinard, and Paul Eggert, all pushing and pulling in various +François Pinard, and Paul Eggert, all pushing and pulling in various directions, not always compatible, to the extent that after a couple of test releases, `glocale' was torn apart. In particular, Paul Eggert - always keeping an eye on developments in Solaris - advocated the use of @@ -12456,7 +13250,7 @@ contributed to the effort by providing a discussion forum around Ulrich, writing little pieces of code, or testing. These are quoted in the `THANKS' file which comes with the GNU `gettext' distribution. - While this was being done, Franc,ois adapted half a dozen of GNU + While this was being done, François adapted half a dozen of GNU packages to `glocale' first, then later to `gettext', putting them in pretest, so providing along the way an effective user environment for fine tuning the evolving tools. He also took the responsibility of @@ -12468,7 +13262,7 @@ many native languages, and two moderated lists: one for reaching all teams at once, the other for reaching all willing maintainers of internationalized free software packages. - Franc,ois also wrote PO mode in June 1995 with the collaboration of + François also wrote PO mode in June 1995 with the collaboration of Greg McGary, as a kind of contribution to Ulrich's package. He also gave a hand with the GNU `gettext' Texinfo manual. @@ -12492,7 +13286,7 @@ File: gettext.info, Node: References, Prev: History, Up: Conclusion 16.2 Related Readings ===================== -* NOTE: * This documentation section is outdated and needs to be + * NOTE: * This documentation section is outdated and needs to be revised. Eugene H. Dorr (`dorre@well.com') maintains an interesting @@ -12530,7 +13324,7 @@ File: gettext.info, Node: Language Codes, Next: Country Codes, Prev: Conclusi Appendix A Language Codes ************************* -The ISO 639 standard defines two-letter codes for many languages, and + The ISO 639 standard defines two-letter codes for many languages, and three-letter codes for more rarely used languages. All abbreviations for languages used in the Translation Project should come from this standard. @@ -12546,7 +13340,7 @@ File: gettext.info, Node: Usual Language Codes, Next: Rare Language Codes, Pr A.1 Usual Language Codes ======================== -For the commonly used languages, the ISO 639-1 standard defines + For the commonly used languages, the ISO 639-1 standard defines two-letter codes. `aa' @@ -12658,7 +13452,7 @@ two-letter codes. Dzongkha; Bhutani. `ee' - E'we'. + Éwé. `el' Greek. @@ -12889,7 +13683,7 @@ two-letter codes. Nauru. `nb' - Norwegian Bokmaal. + Norwegian BokmÃ¥l. `nd' Ndebele, North. @@ -12919,7 +13713,7 @@ two-letter codes. Chichewa; Nyanja. `oc' - Occitan; Provenc,al. + Occitan; Provençal. `oj' Ojibwa. @@ -13081,7 +13875,7 @@ two-letter codes. Vietnamese. `vo' - Volapu"k; Volapuk. + Volapük; Volapuk. `wa' Walloon. @@ -13113,9 +13907,9 @@ File: gettext.info, Node: Rare Language Codes, Prev: Usual Language Codes, Up A.2 Rare Language Codes ======================= -For rarely used languages, the ISO 639-2 standard defines three-letter -codes. Here is the current list, reduced to only living languages with -at least one million of speakers. + For rarely used languages, the ISO 639-2 standard defines +three-letter codes. Here is the current list, reduced to only living +languages with at least one million of speakers. `ace' Achinese. @@ -13306,7 +14100,7 @@ File: gettext.info, Node: Country Codes, Next: Licenses, Prev: Language Codes Appendix B Country Codes ************************ -The ISO 3166 standard defines two character codes for many countries + The ISO 3166 standard defines two character codes for many countries and territories. All abbreviations for countries used in the Translation Project should come from this standard. @@ -13437,7 +14231,7 @@ Translation Project should come from this standard. Switzerland. `CI' - Co^te d'Ivoire. + Côte d'Ivoire. `CK' Cook Islands. @@ -14048,16 +14842,16 @@ File: gettext.info, Node: Licenses, Next: Program Index, Prev: Country Codes, Appendix C Licenses ******************* -The files of this package are covered by the licenses indicated in each -particular file or directory. Here is a summary: + The files of this package are covered by the licenses indicated in +each particular file or directory. Here is a summary: * The `libintl' and `libasprintf' libraries are covered by the GNU Library General Public License (LGPL). A copy of the license is - included in *Note GNU LGPL::. + included in *note GNU LGPL::. * The executable programs of this package and the `libgettextpo' library are covered by the GNU General Public License (GPL). A - copy of the license is included in *Note GNU GPL::. + copy of the license is included in *note GNU GPL::. * This manual is free documentation. It is dually licensed under the GNU FDL and the GNU GPL. This means that you can redistribute this @@ -14068,12 +14862,12 @@ particular file or directory. Here is a summary: License, or (at your option) any later version published by the Free Software Foundation (FSF); with no Invariant Sections, with no Front-Cover Text, and with no Back-Cover Texts. A copy of the - license is included in *Note GNU FDL::. + license is included in *note GNU FDL::. This manual is covered by the GNU GPL. You can redistribute it and/or modify it under the terms of the GNU General Public License (GPL), either version 2 of the License, or (at your option) any later version published by the Free Software Foundation (FSF). A - copy of the license is included in *Note GNU GPL::. + copy of the license is included in *note GNU GPL::. * Menu: @@ -14098,9 +14892,9 @@ C.1 GNU GENERAL PUBLIC LICENSE Preamble -------- -The licenses for most software are designed to take away your freedom -to share and change it. By contrast, the GNU General Public License is -intended to guarantee your freedom to share and change free + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to @@ -14382,7 +15176,7 @@ modification follow. Appendix: How to Apply These Terms to Your New Programs ------------------------------------------------------- -If you develop a new program, and you want it to be of the greatest + If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. @@ -14463,10 +15257,10 @@ C.2 GNU LESSER GENERAL PUBLIC LICENSE Preamble -------- -The licenses for most software are designed to take away your freedom -to share and change it. By contrast, the GNU General Public Licenses -are intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software--typically libraries--of the Free @@ -14925,7 +15719,7 @@ be combined with the library in order to run. How to Apply These Terms to Your New Libraries ---------------------------------------------- -If you develop a new library, and you want it to be of the greatest + If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of @@ -15374,7 +16168,7 @@ C.3 GNU Free Documentation License ADDENDUM: How to use this License for your documents ---------------------------------------------------- -To use this License in a document you have written, include a copy of + To use this License in a document you have written, include a copy of the License in the document and put the following copyright and license notices just after the title page: @@ -15448,7 +16242,7 @@ Option Index * --add-comments, xgettext option: xgettext Invocation. (line 97) * --add-location, msgattrib option: msgattrib Invocation. (line 127) -* --add-location, msgcat option: msgcat Invocation. (line 105) +* --add-location, msgcat option: msgcat Invocation. (line 114) * --add-location, msgcomm option: msgcomm Invocation. (line 95) * --add-location, msgconv option: msgconv Invocation. (line 74) * --add-location, msgen option: msgen Invocation. (line 70) @@ -15457,10 +16251,10 @@ Option Index * --add-location, msggrep option: msggrep Invocation. (line 152) * --add-location, msgmerge option: msgmerge Invocation. (line 139) * --add-location, msguniq option: msguniq Invocation. (line 92) -* --add-location, xgettext option: xgettext Invocation. (line 276) +* --add-location, xgettext option: xgettext Invocation. (line 286) * --alignment, msgfmt option: msgfmt Invocation. (line 209) * --backup, msgmerge option: msgmerge Invocation. (line 65) -* --boost, xgettext option: xgettext Invocation. (line 244) +* --boost, xgettext option: xgettext Invocation. (line 252) * --c++, xgettext option: xgettext Invocation. (line 64) * --check, msgfmt option: msgfmt Invocation. (line 146) * --check-accelerators, msgfmt option: msgfmt Invocation. (line 187) @@ -15474,14 +16268,16 @@ Option Index (line 77) * --clear-previous, msgattrib option: msgattrib Invocation. (line 80) +* --color, msgcat option <1>: The --color option. (line 6) +* --color, msgcat option: msgcat Invocation. (line 95) * --comment, msggrep option: msggrep Invocation. (line 93) * --compendium, msgmerge option: msgmerge Invocation. (line 36) -* --copyright-holder, xgettext option: xgettext Invocation. (line 323) +* --copyright-holder, xgettext option: xgettext Invocation. (line 336) * --csharp, msgfmt option: msgfmt Invocation. (line 36) * --csharp, msgunfmt option: msgunfmt Invocation. (line 19) * --csharp-resources, msgfmt option: msgfmt Invocation. (line 40) * --csharp-resources, msgunfmt option: msgunfmt Invocation. (line 23) -* --debug, xgettext option: xgettext Invocation. (line 248) +* --debug, xgettext option: xgettext Invocation. (line 256) * --default-domain, xgettext option: xgettext Invocation. (line 36) * --directory, msgattrib option: msgattrib Invocation. (line 19) @@ -15504,7 +16300,7 @@ Option Index * --dry-run, autopoint option: autopoint Invocation. (line 24) * --dry-run, gettextize option: gettextize Invocation. - (line 65) + (line 72) * --exclude-file, xgettext option: xgettext Invocation. (line 92) * --expression, msgfilter option: msgfilter Invocation. (line 70) @@ -15518,14 +16314,14 @@ Option Index * --files-from, msgcomm option: msgcomm Invocation. (line 25) * --files-from, xgettext option: xgettext Invocation. (line 19) * --fixed-strings, msggrep option: msggrep Invocation. (line 105) -* --flag, xgettext option: xgettext Invocation. (line 195) +* --flag, xgettext option: xgettext Invocation. (line 199) * --force, autopoint option: autopoint Invocation. (line 20) * --force, gettextize option: gettextize Invocation. (line 40) * --force-po, msgattrib option: msgattrib Invocation. (line 116) -* --force-po, msgcat option: msgcat Invocation. (line 94) +* --force-po, msgcat option: msgcat Invocation. (line 103) * --force-po, msgcomm option: msgcomm Invocation. (line 84) * --force-po, msgconv option: msgconv Invocation. (line 64) * --force-po, msgen option: msgen Invocation. (line 60) @@ -15535,8 +16331,8 @@ Option Index * --force-po, msgmerge option: msgmerge Invocation. (line 129) * --force-po, msgunfmt option: msgunfmt Invocation. (line 108) * --force-po, msguniq option: msguniq Invocation. (line 81) -* --force-po, xgettext option: xgettext Invocation. (line 265) -* --foreign-user, xgettext option: xgettext Invocation. (line 338) +* --force-po, xgettext option: xgettext Invocation. (line 273) +* --foreign-user, xgettext option: xgettext Invocation. (line 351) * --from-code, xgettext option: xgettext Invocation. (line 74) * --fuzzy, msgattrib option: msgattrib Invocation. (line 91) @@ -15545,10 +16341,10 @@ Option Index * --help, envsubst option: envsubst Invocation. (line 22) * --help, gettext option: gettext Invocation. (line 32) * --help, gettextize option: gettextize Invocation. - (line 70) + (line 77) * --help, msgattrib option: msgattrib Invocation. (line 172) -* --help, msgcat option: msgcat Invocation. (line 150) +* --help, msgcat option: msgcat Invocation. (line 159) * --help, msgcmp option: msgcmp Invocation. (line 67) * --help, msgcomm option: msgcomm Invocation. (line 143) * --help, msgconv option: msgconv Invocation. (line 119) @@ -15563,13 +16359,13 @@ Option Index * --help, msgunfmt option: msgunfmt Invocation. (line 153) * --help, msguniq option: msguniq Invocation. (line 137) * --help, ngettext option: ngettext Invocation. (line 31) -* --help, xgettext option: xgettext Invocation. (line 384) +* --help, xgettext option: xgettext Invocation. (line 404) * --ignore-case, msggrep option: msggrep Invocation. (line 117) * --ignore-file, msgattrib option: msgattrib Invocation. (line 87) * --indent, msgattrib option: msgattrib Invocation. (line 120) -* --indent, msgcat option: msgcat Invocation. (line 98) +* --indent, msgcat option: msgcat Invocation. (line 107) * --indent, msgcomm option: msgcomm Invocation. (line 88) * --indent, msgconv option: msgconv Invocation. (line 68) * --indent, msgen option: msgen Invocation. (line 64) @@ -15579,7 +16375,7 @@ Option Index * --indent, msgmerge option: msgmerge Invocation. (line 133) * --indent, msgunfmt option: msgunfmt Invocation. (line 112) * --indent, msguniq option: msguniq Invocation. (line 85) -* --indent, xgettext option: xgettext Invocation. (line 269) +* --indent, xgettext option: xgettext Invocation. (line 277) * --input, msgexec option: msgexec Invocation. (line 40) * --input, msgfilter option: msgfilter Invocation. (line 16) @@ -15591,6 +16387,7 @@ Option Index * --java, msgunfmt option: msgunfmt Invocation. (line 16) * --java2, msgfmt option: msgfmt Invocation. (line 33) * --join-existing, xgettext option: xgettext Invocation. (line 88) +* --kde, xgettext option: xgettext Invocation. (line 248) * --keep-header, msgfilter option: msgfilter Invocation. (line 120) * --keyword, xgettext option: xgettext Invocation. (line 114) @@ -15605,21 +16402,21 @@ Option Index * --more-than, msgcomm option: msgcomm Invocation. (line 58) * --msgctxt, msggrep option: msggrep Invocation. (line 81) * --msgid, msggrep option: msggrep Invocation. (line 85) -* --msgid-bugs-address, xgettext option: xgettext Invocation. (line 344) +* --msgid-bugs-address, xgettext option: xgettext Invocation. (line 364) * --msgstr, msggrep option: msggrep Invocation. (line 89) -* --msgstr-prefix, xgettext option: xgettext Invocation. (line 372) -* --msgstr-suffix, xgettext option: xgettext Invocation. (line 376) +* --msgstr-prefix, xgettext option: xgettext Invocation. (line 392) +* --msgstr-suffix, xgettext option: xgettext Invocation. (line 396) * --multi-domain, msgcmp option: msgcmp Invocation. (line 36) * --multi-domain, msgmerge option: msgmerge Invocation. (line 101) * --no-changelog, gettextize option: gettextize Invocation. - (line 51) + (line 58) * --no-fuzzy, msgattrib option: msgattrib Invocation. (line 47) * --no-fuzzy-matching, msgmerge option: msgmerge Invocation. (line 105) * --no-hash, msgfmt option: msgfmt Invocation. (line 212) * --no-location, msgattrib option: msgattrib Invocation. (line 123) -* --no-location, msgcat option: msgcat Invocation. (line 101) +* --no-location, msgcat option: msgcat Invocation. (line 110) * --no-location, msgcomm option: msgcomm Invocation. (line 91) * --no-location, msgconv option: msgconv Invocation. (line 71) * --no-location, msgen option: msgen Invocation. (line 67) @@ -15628,13 +16425,13 @@ Option Index * --no-location, msggrep option: msggrep Invocation. (line 149) * --no-location, msgmerge option: msgmerge Invocation. (line 136) * --no-location, msguniq option: msguniq Invocation. (line 88) -* --no-location, xgettext option: xgettext Invocation. (line 272) +* --no-location, xgettext option: xgettext Invocation. (line 280) * --no-obsolete, msgattrib option: msgattrib Invocation. (line 53) * --no-translator, msginit option: msginit Invocation. (line 58) * --no-wrap, msgattrib option: msgattrib Invocation. (line 152) -* --no-wrap, msgcat option: msgcat Invocation. (line 130) +* --no-wrap, msgcat option: msgcat Invocation. (line 139) * --no-wrap, msgcomm option: msgcomm Invocation. (line 120) * --no-wrap, msgconv option: msgconv Invocation. (line 99) * --no-wrap, msgen option: msgen Invocation. (line 95) @@ -15645,11 +16442,11 @@ Option Index * --no-wrap, msgmerge option: msgmerge Invocation. (line 164) * --no-wrap, msgunfmt option: msgunfmt Invocation. (line 137) * --no-wrap, msguniq option: msguniq Invocation. (line 117) -* --no-wrap, xgettext option: xgettext Invocation. (line 300) +* --no-wrap, xgettext option: xgettext Invocation. (line 310) * --obsolete, msgattrib option: msgattrib Invocation. (line 95) * --omit-header, msgcomm option: msgcomm Invocation. (line 135) -* --omit-header, xgettext option: xgettext Invocation. (line 315) +* --omit-header, xgettext option: xgettext Invocation. (line 325) * --only-file, msgattrib option: msgattrib Invocation. (line 83) * --only-fuzzy, msgattrib option: msgattrib Invocation. @@ -15672,6 +16469,10 @@ Option Index * --output-file, msgmerge option: msgmerge Invocation. (line 53) * --output-file, msgunfmt option: msgunfmt Invocation. (line 98) * --output-file, msguniq option: msguniq Invocation. (line 38) +* --package-name, xgettext option: xgettext Invocation. (line 357) +* --package-version, xgettext option: xgettext Invocation. (line 360) +* --po-dir, gettextize option: gettextize Invocation. + (line 51) * --previous, msgmerge option: msgmerge Invocation. (line 109) * --properties-input, msgattrib option: msgattrib Invocation. (line 104) @@ -15690,7 +16491,7 @@ Option Index * --properties-input, msguniq option: msguniq Invocation. (line 61) * --properties-output, msgattrib option: msgattrib Invocation. (line 136) -* --properties-output, msgcat option: msgcat Invocation. (line 114) +* --properties-output, msgcat option: msgcat Invocation. (line 123) * --properties-output, msgcomm option: msgcomm Invocation. (line 104) * --properties-output, msgconv option: msgconv Invocation. (line 83) * --properties-output, msgen option: msgen Invocation. (line 79) @@ -15701,9 +16502,9 @@ Option Index * --properties-output, msgmerge option: msgmerge Invocation. (line 148) * --properties-output, msgunfmt option: msgunfmt Invocation. (line 121) * --properties-output, msguniq option: msguniq Invocation. (line 101) -* --properties-output, xgettext option: xgettext Invocation. (line 284) +* --properties-output, xgettext option: xgettext Invocation. (line 294) * --qt, msgfmt option: msgfmt Invocation. (line 46) -* --qt, xgettext option: xgettext Invocation. (line 240) +* --qt, xgettext option: xgettext Invocation. (line 244) * --quiet, msgfilter option: msgfilter Invocation. (line 79) * --quiet, msgmerge option: msgmerge Invocation. (line 197) @@ -15720,7 +16521,7 @@ Option Index * --silent, msgmerge option: msgmerge Invocation. (line 197) * --sort-by-file, msgattrib option: msgattrib Invocation. (line 164) -* --sort-by-file, msgcat option: msgcat Invocation. (line 142) +* --sort-by-file, msgcat option: msgcat Invocation. (line 151) * --sort-by-file, msgcomm option: msgcomm Invocation. (line 132) * --sort-by-file, msgconv option: msgconv Invocation. (line 111) * --sort-by-file, msgen option: msgen Invocation. (line 107) @@ -15729,10 +16530,10 @@ Option Index * --sort-by-file, msggrep option: msggrep Invocation. (line 187) * --sort-by-file, msgmerge option: msgmerge Invocation. (line 176) * --sort-by-file, msguniq option: msguniq Invocation. (line 129) -* --sort-by-file, xgettext option: xgettext Invocation. (line 312) +* --sort-by-file, xgettext option: xgettext Invocation. (line 322) * --sort-output, msgattrib option: msgattrib Invocation. (line 159) -* --sort-output, msgcat option: msgcat Invocation. (line 137) +* --sort-output, msgcat option: msgcat Invocation. (line 146) * --sort-output, msgcomm option: msgcomm Invocation. (line 127) * --sort-output, msgconv option: msgconv Invocation. (line 106) * --sort-output, msgen option: msgen Invocation. (line 102) @@ -15742,11 +16543,11 @@ Option Index * --sort-output, msgmerge option: msgmerge Invocation. (line 171) * --sort-output, msgunfmt option: msgunfmt Invocation. (line 144) * --sort-output, msguniq option: msguniq Invocation. (line 124) -* --sort-output, xgettext option: xgettext Invocation. (line 307) +* --sort-output, xgettext option: xgettext Invocation. (line 317) * --statistics, msgfmt option: msgfmt Invocation. (line 229) * --strict, msgattrib option: msgattrib Invocation. (line 130) -* --strict, msgcat option: msgcat Invocation. (line 108) +* --strict, msgcat option: msgcat Invocation. (line 117) * --strict, msgcomm option: msgcomm Invocation. (line 98) * --strict, msgconv option: msgconv Invocation. (line 77) * --strict, msgen option: msgen Invocation. (line 73) @@ -15757,7 +16558,7 @@ Option Index * --strict, msgmerge option: msgmerge Invocation. (line 142) * --strict, msgunfmt option: msgunfmt Invocation. (line 115) * --strict, msguniq option: msguniq Invocation. (line 95) -* --strict, xgettext option: xgettext Invocation. (line 279) +* --strict, xgettext option: xgettext Invocation. (line 289) * --stringtable-input, msgattrib option: msgattrib Invocation. (line 108) * --stringtable-input, msgcat option: msgcat Invocation. (line 78) @@ -15775,7 +16576,7 @@ Option Index * --stringtable-input, msguniq option: msguniq Invocation. (line 65) * --stringtable-output, msgattrib option: msgattrib Invocation. (line 141) -* --stringtable-output, msgcat option: msgcat Invocation. (line 119) +* --stringtable-output, msgcat option: msgcat Invocation. (line 128) * --stringtable-output, msgcomm option: msgcomm Invocation. (line 109) * --stringtable-output, msgconv option: msgconv Invocation. (line 88) * --stringtable-output, msgen option: msgen Invocation. (line 84) @@ -15786,10 +16587,12 @@ Option Index * --stringtable-output, msgmerge option: msgmerge Invocation. (line 153) * --stringtable-output, msgunfmt option: msgunfmt Invocation. (line 126) * --stringtable-output, msguniq option: msguniq Invocation. (line 106) -* --stringtable-output, xgettext option: xgettext Invocation. (line 289) +* --stringtable-output, xgettext option: xgettext Invocation. (line 299) +* --style, msgcat option <1>: The --style option. (line 6) +* --style, msgcat option: msgcat Invocation. (line 99) * --suffix, msgmerge option: msgmerge Invocation. (line 68) * --symlink, gettextize option: gettextize Invocation. - (line 56) + (line 63) * --tcl, msgfmt option: msgfmt Invocation. (line 43) * --tcl, msgunfmt option: msgunfmt Invocation. (line 26) * --to-code, msgcat option: msgcat Invocation. (line 87) @@ -15797,7 +16600,7 @@ Option Index * --to-code, msguniq option: msguniq Invocation. (line 74) * --translated, msgattrib option: msgattrib Invocation. (line 41) -* --trigraphs, xgettext option: xgettext Invocation. (line 235) +* --trigraphs, xgettext option: xgettext Invocation. (line 239) * --unique, msgcat option: msgcat Invocation. (line 65) * --unique, msgcomm option: msgcomm Invocation. (line 63) * --unique, msguniq option: msguniq Invocation. (line 53) @@ -15818,10 +16621,10 @@ Option Index * --version, envsubst option: envsubst Invocation. (line 26) * --version, gettext option: gettext Invocation. (line 40) * --version, gettextize option: gettextize Invocation. - (line 73) + (line 80) * --version, msgattrib option: msgattrib Invocation. (line 176) -* --version, msgcat option: msgcat Invocation. (line 154) +* --version, msgcat option: msgcat Invocation. (line 163) * --version, msgcmp option: msgcmp Invocation. (line 71) * --version, msgcomm option: msgcomm Invocation. (line 147) * --version, msgconv option: msgconv Invocation. (line 123) @@ -15836,10 +16639,10 @@ Option Index * --version, msgunfmt option: msgunfmt Invocation. (line 157) * --version, msguniq option: msguniq Invocation. (line 141) * --version, ngettext option: ngettext Invocation. (line 35) -* --version, xgettext option: xgettext Invocation. (line 388) +* --version, xgettext option: xgettext Invocation. (line 408) * --width, msgattrib option: msgattrib Invocation. (line 146) -* --width, msgcat option: msgcat Invocation. (line 124) +* --width, msgcat option: msgcat Invocation. (line 133) * --width, msgcomm option: msgcomm Invocation. (line 114) * --width, msgconv option: msgconv Invocation. (line 93) * --width, msgen option: msgen Invocation. (line 89) @@ -15850,7 +16653,7 @@ Option Index * --width, msgmerge option: msgmerge Invocation. (line 158) * --width, msgunfmt option: msgunfmt Invocation. (line 131) * --width, msguniq option: msguniq Invocation. (line 111) -* --width, xgettext option: xgettext Invocation. (line 294) +* --width, xgettext option: xgettext Invocation. (line 304) * -<, msgcat option: msgcat Invocation. (line 55) * -<, msgcomm option: msgcomm Invocation. (line 53) * ->, msgcat option: msgcat Invocation. (line 60) @@ -15867,7 +16670,7 @@ Option Index (line 24) * -d, gettext option: gettext Invocation. (line 16) * -d, gettextize option: gettextize Invocation. - (line 65) + (line 72) * -D, msgattrib option: msgattrib Invocation. (line 19) * -D, msgcat option: msgcat Invocation. (line 32) @@ -15902,7 +16705,7 @@ Option Index (line 40) * -F, msgattrib option: msgattrib Invocation. (line 164) -* -F, msgcat option: msgcat Invocation. (line 142) +* -F, msgcat option: msgcat Invocation. (line 151) * -f, msgcat option: msgcat Invocation. (line 27) * -F, msgcomm option: msgcomm Invocation. (line 132) * -f, msgcomm option: msgcomm Invocation. (line 25) @@ -15917,13 +16720,13 @@ Option Index * -F, msggrep option: msggrep Invocation. (line 105) * -F, msgmerge option: msgmerge Invocation. (line 176) * -F, msguniq option: msguniq Invocation. (line 129) -* -F, xgettext option: xgettext Invocation. (line 312) +* -F, xgettext option: xgettext Invocation. (line 322) * -f, xgettext option: xgettext Invocation. (line 19) * -h, envsubst option: envsubst Invocation. (line 22) * -h, gettext option: gettext Invocation. (line 32) * -h, msgattrib option: msgattrib Invocation. (line 172) -* -h, msgcat option: msgcat Invocation. (line 150) +* -h, msgcat option: msgcat Invocation. (line 159) * -h, msgcmp option: msgcmp Invocation. (line 67) * -h, msgcomm option: msgcomm Invocation. (line 143) * -h, msgconv option: msgconv Invocation. (line 119) @@ -15938,10 +16741,10 @@ Option Index * -h, msgunfmt option: msgunfmt Invocation. (line 153) * -h, msguniq option: msguniq Invocation. (line 137) * -h, ngettext option: ngettext Invocation. (line 31) -* -h, xgettext option: xgettext Invocation. (line 384) +* -h, xgettext option: xgettext Invocation. (line 404) * -i, msgattrib option: msgattrib Invocation. (line 120) -* -i, msgcat option: msgcat Invocation. (line 98) +* -i, msgcat option: msgcat Invocation. (line 107) * -i, msgcomm option: msgcomm Invocation. (line 88) * -i, msgconv option: msgconv Invocation. (line 68) * -i, msgen option: msgen Invocation. (line 64) @@ -15953,7 +16756,7 @@ Option Index * -i, msgmerge option: msgmerge Invocation. (line 133) * -i, msgunfmt option: msgunfmt Invocation. (line 112) * -i, msguniq option: msguniq Invocation. (line 85) -* -i, xgettext option: xgettext Invocation. (line 269) +* -i, xgettext option: xgettext Invocation. (line 277) * -j, msgfmt option: msgfmt Invocation. (line 30) * -J, msggrep option: msggrep Invocation. (line 81) * -j, msgunfmt option: msgunfmt Invocation. (line 16) @@ -15967,19 +16770,19 @@ Option Index * -m, msgcmp option: msgcmp Invocation. (line 36) * -M, msggrep option: msggrep Invocation. (line 77) * -m, msgmerge option: msgmerge Invocation. (line 101) -* -M, xgettext option: xgettext Invocation. (line 376) -* -m, xgettext option: xgettext Invocation. (line 372) +* -M, xgettext option: xgettext Invocation. (line 396) +* -m, xgettext option: xgettext Invocation. (line 392) * -n, gettext option: gettext Invocation. (line 35) * -n, msgattrib option: msgattrib Invocation. (line 127) -* -n, msgcat option: msgcat Invocation. (line 105) +* -n, msgcat option: msgcat Invocation. (line 114) * -n, msgcomm option: msgcomm Invocation. (line 95) * -n, msgfilter option: msgfilter Invocation. (line 79) * -N, msggrep option: msggrep Invocation. (line 72) * -N, msgmerge option: msgmerge Invocation. (line 105) * -n, msguniq option: msguniq Invocation. (line 92) -* -n, xgettext option: xgettext Invocation. (line 276) +* -n, xgettext option: xgettext Invocation. (line 286) * -o, msgattrib option: msgattrib Invocation. (line 31) * -o, msgcat option: msgcat Invocation. (line 44) @@ -15999,7 +16802,7 @@ Option Index (line 136) * -P, msgattrib option: msgattrib Invocation. (line 104) -* -p, msgcat option: msgcat Invocation. (line 114) +* -p, msgcat option: msgcat Invocation. (line 123) * -P, msgcat option: msgcat Invocation. (line 74) * -P, msgcmp option: msgcmp Invocation. (line 54) * -p, msgcomm option: msgcomm Invocation. (line 104) @@ -16029,7 +16832,7 @@ Option Index * -r, msgunfmt option: msgunfmt Invocation. (line 43) * -s, msgattrib option: msgattrib Invocation. (line 159) -* -s, msgcat option: msgcat Invocation. (line 137) +* -s, msgcat option: msgcat Invocation. (line 146) * -s, msgcomm option: msgcomm Invocation. (line 127) * -s, msgconv option: msgconv Invocation. (line 106) * -s, msgen option: msgen Invocation. (line 102) @@ -16038,12 +16841,12 @@ Option Index * -s, msgmerge option: msgmerge Invocation. (line 171) * -s, msgunfmt option: msgunfmt Invocation. (line 144) * -s, msguniq option: msguniq Invocation. (line 124) -* -s, xgettext option: xgettext Invocation. (line 307) +* -s, xgettext option: xgettext Invocation. (line 317) * -t, msgcat option: msgcat Invocation. (line 87) * -t, msgconv option: msgconv Invocation. (line 42) * -T, msggrep option: msggrep Invocation. (line 89) * -t, msguniq option: msguniq Invocation. (line 74) -* -T, xgettext option: xgettext Invocation. (line 235) +* -T, xgettext option: xgettext Invocation. (line 239) * -u, msgcat option: msgcat Invocation. (line 65) * -u, msgcomm option: msgcomm Invocation. (line 63) * -U, msgmerge option: msgmerge Invocation. (line 45) @@ -16053,7 +16856,7 @@ Option Index * -V, gettext option: gettext Invocation. (line 40) * -V, msgattrib option: msgattrib Invocation. (line 176) -* -V, msgcat option: msgcat Invocation. (line 154) +* -V, msgcat option: msgcat Invocation. (line 163) * -V, msgcmp option: msgcmp Invocation. (line 71) * -V, msgcomm option: msgcomm Invocation. (line 147) * -V, msgconv option: msgconv Invocation. (line 123) @@ -16072,10 +16875,10 @@ Option Index * -V, msgunfmt option: msgunfmt Invocation. (line 157) * -V, msguniq option: msguniq Invocation. (line 141) * -V, ngettext option: ngettext Invocation. (line 35) -* -V, xgettext option: xgettext Invocation. (line 388) +* -V, xgettext option: xgettext Invocation. (line 408) * -w, msgattrib option: msgattrib Invocation. (line 146) -* -w, msgcat option: msgcat Invocation. (line 124) +* -w, msgcat option: msgcat Invocation. (line 133) * -w, msgcomm option: msgcomm Invocation. (line 114) * -w, msgconv option: msgconv Invocation. (line 93) * -w, msgen option: msgen Invocation. (line 89) @@ -16086,7 +16889,7 @@ Option Index * -w, msgmerge option: msgmerge Invocation. (line 158) * -w, msgunfmt option: msgunfmt Invocation. (line 131) * -w, msguniq option: msguniq Invocation. (line 111) -* -w, xgettext option: xgettext Invocation. (line 294) +* -w, xgettext option: xgettext Invocation. (line 304) * -X, msggrep option: msggrep Invocation. (line 97) * -x, xgettext option: xgettext Invocation. (line 92) @@ -16102,20 +16905,39 @@ Variable Index * GETTEXT_LOG_UNTRANSLATED, environment variable: Prioritizing messages. (line 23) * LANG, environment variable <1>: gettext grok. (line 32) -* LANG, environment variable: End Users. (line 6) +* LANG, environment variable: Locale Environment Variables. + (line 17) * LANGUAGE, environment variable <1>: po/Rules-*. (line 11) -* LANGUAGE, environment variable: gettext grok. (line 28) -* LC_ALL, environment variable: gettext grok. (line 28) -* LC_COLLATE, environment variable: gettext grok. (line 30) -* LC_CTYPE, environment variable: gettext grok. (line 30) -* LC_MESSAGES, environment variable: gettext grok. (line 30) -* LC_MONETARY, environment variable: gettext grok. (line 30) -* LC_NUMERIC, environment variable: gettext grok. (line 30) -* LC_TIME, environment variable: gettext grok. (line 30) +* LANGUAGE, environment variable <2>: gettext grok. (line 28) +* LANGUAGE, environment variable: Locale Environment Variables. + (line 11) +* LC_ALL, environment variable <1>: gettext grok. (line 28) +* LC_ALL, environment variable: Locale Environment Variables. + (line 11) +* LC_COLLATE, environment variable <1>: gettext grok. (line 30) +* LC_COLLATE, environment variable: Locale Environment Variables. + (line 13) +* LC_CTYPE, environment variable <1>: gettext grok. (line 30) +* LC_CTYPE, environment variable: Locale Environment Variables. + (line 13) +* LC_MESSAGES, environment variable <1>: gettext grok. (line 30) +* LC_MESSAGES, environment variable: Locale Environment Variables. + (line 13) +* LC_MONETARY, environment variable <1>: gettext grok. (line 30) +* LC_MONETARY, environment variable: Locale Environment Variables. + (line 13) +* LC_NUMERIC, environment variable <1>: gettext grok. (line 30) +* LC_NUMERIC, environment variable: Locale Environment Variables. + (line 13) +* LC_TIME, environment variable <1>: gettext grok. (line 30) +* LC_TIME, environment variable: Locale Environment Variables. + (line 13) * LINGUAS, environment variable: Installers. (line 17) * MSGEXEC_LOCATION, environment variable: msgexec Invocation. (line 18) * MSGEXEC_MSGCTXT, environment variable: msgexec Invocation. (line 18) * MSGEXEC_MSGID, environment variable: msgexec Invocation. (line 18) +* PO_STYLE, environment variable: The --style option. (line 10) +* TERM, environment variable: The TERM variable. (line 6) * TEXTDOMAIN, environment variable: sh. (line 23) * TEXTDOMAINDIR, environment variable: sh. (line 26) @@ -16337,6 +17159,7 @@ Autoconf Macro Index (line 6) * AM_ICONV: AM_ICONV. (line 6) * AM_PO_SUBDIRS: AM_PO_SUBDIRS. (line 6) +* AM_XGETTEXT_OPTION: AM_XGETTEXT_OPTION. (line 6)  File: gettext.info, Node: Index, Prev: Autoconf Macro Index, Up: Top @@ -16349,7 +17172,8 @@ General Index * _, a macro to mark strings for translation: Mark Keywords. (line 45) * _nl_msg_cat_cntr: gettext grok. (line 62) -* ABOUT-NLS file: Matrix. (line 6) +* ABOUT-NLS file: Installing Localizations. + (line 13) * acconfig.h file: acconfig. (line 6) * accumulating translations: Creating Compendia. (line 14) * aclocal.m4 file: aclocal. (line 6) @@ -16369,7 +17193,8 @@ General Index * autopoint program, usage: autopoint Invocation. (line 6) * auxiliary PO file: Auxiliary. (line 13) -* available translations: Matrix. (line 6) +* available translations: Installing Localizations. + (line 6) * awk: gawk. (line 6) * awk-format flag: PO Files. (line 149) * backup old file, and msgmerge program: msgmerge Invocation. (line 65) @@ -16377,11 +17202,11 @@ General Index * bibliography: References. (line 6) * big picture: Overview. (line 6) * bind_textdomain_codeset: Charset conversion. (line 28) -* Boost format strings: xgettext Invocation. (line 244) -* boost-format flag: PO Files. (line 185) +* Boost format strings: xgettext Invocation. (line 252) +* boost-format flag: PO Files. (line 189) * bug report address: Introduction. (line 24) * C and C-like languages: C. (line 6) -* C trigraphs: xgettext Invocation. (line 235) +* C trigraphs: xgettext Invocation. (line 239) * C#: C#. (line 6) * C# mode, and msgfmt program: msgfmt Invocation. (line 36) * C# mode, and msgunfmt program: msgunfmt Invocation. (line 19) @@ -16407,7 +17232,7 @@ General Index * clisp: Common Lisp. (line 6) * clisp C sources: clisp C. (line 6) * codeset: Aspects. (line 67) -* comments in PO files: PO Files. (line 284) +* comments in PO files: PO Files. (line 288) * comments, automatic: PO Files. (line 36) * comments, extracted: PO Files. (line 36) * comments, translator: PO Files. (line 36) @@ -16426,7 +17251,7 @@ General Index * context, argument specification in xgettext: xgettext Invocation. (line 117) * context, in MO files: MO Files. (line 63) -* context, in PO files: PO Files. (line 189) +* context, in PO files: PO Files. (line 193) * control characters: Preparing Strings. (line 190) * convert binary message catalog into PO file: msgunfmt Invocation. (line 8) @@ -16444,7 +17269,7 @@ General Index * dcpgettext: Contexts. (line 56) * dcpgettext_expr: Contexts. (line 112) * debugging messages marked as format strings: xgettext Invocation. - (line 248) + (line 256) * dialect: Manipulating. (line 28) * disabling NLS: lib/gettext.h. (line 6) * distribution tarball: Release Management. (line 6) @@ -16488,8 +17313,8 @@ General Index * force use of fuzzy entries: msgfmt Invocation. (line 199) * format strings: c-format Flag. (line 6) * Free Pascal: Pascal. (line 6) -* function attribute, __format__: xgettext Invocation. (line 199) -* function attribute, __format_arg__: xgettext Invocation. (line 213) +* function attribute, __format__: xgettext Invocation. (line 203) +* function attribute, __format_arg__: xgettext Invocation. (line 217) * fuzzy entries: Fuzzy Entries. (line 6) * fuzzy flag: PO Files. (line 80) * gawk: gawk. (line 6) @@ -16538,17 +17363,20 @@ General Index * Java mode, and msgunfmt program: msgunfmt Invocation. (line 16) * Java, string concatenation: Preparing Strings. (line 168) * java-format flag: PO Files. (line 141) +* KDE format strings: xgettext Invocation. (line 248) * KDE PO file editor: KBabel. (line 6) +* kde-format flag: PO Files. (line 185) * keyboard accelerator checking: msgfmt Invocation. (line 187) * l10n: Concepts. (line 6) * language codes: Language Codes. (line 6) -* language selection: End Users. (line 6) +* language selection: Locale Environment Variables. + (line 6) * language selection at runtime: gettext grok. (line 14) * large package: Ambiguities. (line 6) * LGPL, GNU Lesser General Public License: GNU LGPL. (line 6) * libiconv library: AM_ICONV. (line 21) -* libintl for C#: C#. (line 161) -* libintl for Java: Java. (line 104) +* libintl for C#: C#. (line 178) +* libintl for Java: Java. (line 105) * libintl library: AM_GNU_GETTEXT. (line 53) * librep Lisp: librep. (line 6) * librep-format flag: PO Files. (line 129) @@ -16560,24 +17388,24 @@ General Index * link with libintl: Overview. (line 62) * Linux <1>: Header Entry. (line 91) * Linux <2>: Overview. (line 62) -* Linux: Aspects. (line 114) +* Linux: Aspects. (line 125) * Lisp: Common Lisp. (line 6) * lisp-format flag: PO Files. (line 121) -* list of translation teams, where to find: Header Entry. (line 58) -* locale facet, LC_ALL: Triggering. (line 23) -* locale facet, LC_COLLATE: Triggering. (line 52) -* locale facet, LC_CTYPE <1>: Triggering. (line 23) -* locale facet, LC_CTYPE: Aspects. (line 67) -* locale facet, LC_MESSAGES <1>: Triggering. (line 52) -* locale facet, LC_MESSAGES: Aspects. (line 108) -* locale facet, LC_MONETARY <1>: Triggering. (line 52) -* locale facet, LC_MONETARY: Aspects. (line 79) -* locale facet, LC_NUMERIC <1>: Triggering. (line 52) -* locale facet, LC_NUMERIC: Aspects. (line 94) -* locale facet, LC_RESPONSES: Triggering. (line 52) -* locale facet, LC_TIME <1>: Triggering. (line 52) -* locale facet, LC_TIME: Aspects. (line 84) -* locale facets: Aspects. (line 61) +* list of translation teams, where to find: Header Entry. (line 59) +* locale categories: Aspects. (line 61) +* locale category, LC_ALL: Triggering. (line 23) +* locale category, LC_COLLATE: Triggering. (line 53) +* locale category, LC_CTYPE <1>: Triggering. (line 23) +* locale category, LC_CTYPE: Aspects. (line 67) +* locale category, LC_MESSAGES <1>: Triggering. (line 53) +* locale category, LC_MESSAGES: Aspects. (line 108) +* locale category, LC_MONETARY <1>: Triggering. (line 53) +* locale category, LC_MONETARY: Aspects. (line 79) +* locale category, LC_NUMERIC <1>: Triggering. (line 53) +* locale category, LC_NUMERIC: Aspects. (line 94) +* locale category, LC_RESPONSES: Triggering. (line 53) +* locale category, LC_TIME <1>: Triggering. (line 53) +* locale category, LC_TIME: Aspects. (line 84) * locale program: Header Entry. (line 71) * localization: Concepts. (line 26) * lookup message translation <1>: eval_gettext Invocation. @@ -16614,7 +17442,7 @@ General Index * msgcmp program, usage: msgcmp Invocation. (line 6) * msgcomm program, usage: msgcomm Invocation. (line 6) * msgconv program, usage: msgconv Invocation. (line 6) -* msgctxt: PO Files. (line 189) +* msgctxt: PO Files. (line 193) * msgen program, usage: msgen Invocation. (line 6) * msgexec program, usage: msgexec Invocation. (line 6) * msgfilter filter and catalog encoding: msgfilter Invocation. @@ -16624,7 +17452,7 @@ General Index * msgfmt program, usage: msgfmt Invocation. (line 6) * msggrep program, usage: msggrep Invocation. (line 6) * msgid: PO Files. (line 56) -* msgid_plural: PO Files. (line 209) +* msgid_plural: PO Files. (line 213) * msginit program, usage: msginit Invocation. (line 6) * msgmerge program, usage: msgmerge Invocation. (line 6) * msgstr: PO Files. (line 56) @@ -16634,18 +17462,19 @@ General Index * N_, a convenience macro: Comparison. (line 41) * Native Language Support: Concepts. (line 51) * Natural Language Support: Concepts. (line 51) -* newlines in PO files: PO Files. (line 279) +* newlines in PO files: PO Files. (line 283) * ngettext: Plural forms. (line 84) * ngettext program, usage: ngettext Invocation. (line 6) * NLS: Concepts. (line 51) * no-awk-format flag: PO Files. (line 150) -* no-boost-format flag: PO Files. (line 186) +* no-boost-format flag: PO Files. (line 190) * no-c-format flag: PO Files. (line 91) * no-c-format, and xgettext: c-format Flag. (line 48) * no-csharp-format flag: PO Files. (line 146) * no-elisp-format flag: PO Files. (line 126) * no-gcc-internal-format flag: PO Files. (line 178) * no-java-format flag: PO Files. (line 142) +* no-kde-format flag: PO Files. (line 186) * no-librep-format flag: PO Files. (line 130) * no-lisp-format flag: PO Files. (line 122) * no-objc-format flag: PO Files. (line 110) @@ -16671,7 +17500,7 @@ General Index * outdigits: c-format. (line 28) * output to stdout, xgettext: xgettext Invocation. (line 48) * overview of gettext: Overview. (line 6) -* package and version declaration in configure.in: configure.in. +* package and version declaration in configure.ac: configure.ac. (line 9) * package build and installation options: Installers. (line 6) * package distributor's view of gettext: Installers. (line 6) @@ -16699,7 +17528,7 @@ General Index * plural form formulas: Plural forms. (line 165) * plural forms: Plural forms. (line 6) * plural forms, in MO files: MO Files. (line 66) -* plural forms, in PO files: PO Files. (line 209) +* plural forms, in PO files: PO Files. (line 213) * plural, in a PO file header: Plural forms. (line 145) * PO files' format: PO Files. (line 6) * PO mode (Emacs) commands: Main PO Commands. (line 6) @@ -16726,7 +17555,7 @@ General Index (line 6) * Python: Python. (line 6) * python-format flag: PO Files. (line 117) -* Qt format strings: xgettext Invocation. (line 240) +* Qt format strings: xgettext Invocation. (line 244) * Qt mode, and msgfmt program: msgfmt Invocation. (line 46) * qt-format flag: PO Files. (line 181) * quotation marks <1>: po/Rules-*. (line 11) @@ -16742,10 +17571,12 @@ General Index * scripting languages: Language Implementors. (line 6) * search messages in a catalog: msggrep Invocation. (line 8) -* selecting message language: End Users. (line 6) +* selecting message language: Locale Environment Variables. + (line 6) * sentences: Preparing Strings. (line 44) * setting up gettext at build time: Installers. (line 6) -* setting up gettext at run time: End Users. (line 6) +* setting up gettext at run time: Locale Environment Variables. + (line 6) * several domains: Ambiguities. (line 6) * sex: Introduction. (line 15) * sh-format flag: PO Files. (line 113) @@ -16754,10 +17585,10 @@ General Index * shell scripts: sh. (line 6) * Smalltalk: Smalltalk. (line 6) * smalltalk-format flag: PO Files. (line 137) -* sorting msgcat output: msgcat Invocation. (line 137) +* sorting msgcat output: msgcat Invocation. (line 146) * sorting msgmerge output: msgmerge Invocation. (line 171) * sorting msgunfmt output: msgunfmt Invocation. (line 144) -* sorting output of xgettext: xgettext Invocation. (line 307) +* sorting output of xgettext: xgettext Invocation. (line 317) * specifying plural form in a PO file: Plural forms. (line 145) * standard output, and msgcat: msgcat Invocation. (line 47) * standard output, and msgmerge program: msgmerge Invocation. (line 56) @@ -16770,12 +17601,13 @@ General Index * Tcl mode, and msgunfmt program: msgunfmt Invocation. (line 26) * tcl-format flag: PO Files. (line 161) * template PO file: Overview. (line 67) -* testing .po files for equivalence: xgettext Invocation. (line 317) +* testing .po files for equivalence: xgettext Invocation. (line 327) * Tk's scripting language: Tcl. (line 6) * translated entries: Translated Entries. (line 6) * translating menu entries: Contexts. (line 6) * translation aspects: Aspects. (line 6) -* Translation Matrix: Matrix. (line 6) +* Translation Matrix: Installing Localizations. + (line 6) * Translation Project: Why. (line 17) * turning off NLS support: lib/gettext.h. (line 6) * tutorial of gettext usage: Overview. (line 6) @@ -16797,221 +17629,240 @@ General Index  Tag Table: -Node: Top2955 -Node: Introduction16245 -Node: Why17865 -Ref: Why-Footnote-121075 -Node: Concepts21231 -Node: Aspects24649 -Node: Files30507 -Node: Overview32413 -Node: Users42331 -Node: Matrix43763 -Node: End Users44971 -Node: PO Files45620 -Ref: PO Files-Footnote-156968 -Node: Sources57095 -Node: Importing58248 -Node: Triggering58928 -Node: Preparing Strings61965 -Node: Mark Keywords71005 -Node: Marking75315 -Node: c-format Flag83042 -Node: Special cases86958 -Node: Names89684 -Node: Libraries93282 -Node: Template96314 -Node: xgettext Invocation97035 -Node: Creating111351 -Node: msginit Invocation112233 -Node: Header Entry114859 -Node: Updating121865 -Node: msgmerge Invocation122080 -Node: Editing127232 -Node: KBabel127530 -Node: Gtranslator127668 -Node: PO Mode127810 -Node: Installation129502 -Node: Main PO Commands131463 -Node: Entry Positioning136548 -Node: Normalizing142014 -Node: Translated Entries146505 -Node: Fuzzy Entries147860 -Node: Untranslated Entries151037 -Node: Obsolete Entries152966 -Node: Modifying Translations156188 -Node: Modifying Comments164154 -Node: Subedit168578 -Node: C Sources Context172471 -Node: Auxiliary177592 -Node: Compendium180824 -Node: Creating Compendia181444 -Node: Using Compendia183929 -Node: Manipulating184862 -Node: msgcat Invocation188624 -Node: msgconv Invocation192874 -Node: msggrep Invocation196053 -Node: msgfilter Invocation201234 -Node: msguniq Invocation206858 -Node: msgcomm Invocation210747 -Node: msgcmp Invocation214792 -Node: msgattrib Invocation216804 -Node: msgen Invocation221486 -Node: msgexec Invocation224821 -Node: libgettextpo227402 -Node: Binaries232524 -Node: msgfmt Invocation232868 -Node: msgunfmt Invocation239873 -Node: MO Files244035 -Node: Programmers252276 -Node: catgets253455 -Node: Interface to catgets254866 -Node: Problems with catgets256872 -Node: gettext257784 -Node: Interface to gettext259284 -Node: Ambiguities261641 -Node: Locating Catalogs264345 -Ref: Locating Catalogs-Footnote-1265503 -Ref: Locating Catalogs-Footnote-2265728 -Node: Charset conversion265877 -Node: Contexts268328 -Node: Plural forms273828 -Ref: Plural forms-Footnote-1288024 -Node: Optimized gettext288146 -Node: Comparison289482 -Node: Using libintl.a293749 -Node: gettext grok294189 -Node: Temp Programmers296818 -Node: Temp Implementations297343 -Node: Temp catgets298720 -Node: Temp WSI300418 -Node: Temp Notes302417 -Node: Translators302917 -Node: Trans Intro 0303380 -Node: Trans Intro 1306114 -Node: Discussions308063 -Node: Organization311718 -Node: Central Coordination313784 -Node: National Teams314923 -Node: Sub-Cultures317447 -Node: Organizational Ideas318381 -Node: Mailing Lists319399 -Node: Information Flow321213 -Node: Prioritizing messages323461 -Node: Maintainers327757 -Node: Flat and Non-Flat329710 -Node: Prerequisites331200 -Node: gettextize Invocation335347 -Node: Adjusting Files342311 -Node: po/POTFILES.in344095 -Node: po/LINGUAS345341 -Node: po/Makevars347030 -Node: po/Rules-*347778 -Node: configure.in349246 -Node: config.guess352257 -Node: mkinstalldirs353610 -Node: aclocal354012 -Node: acconfig356009 -Node: config.h.in356506 -Node: Makefile357971 -Node: src/Makefile360565 -Node: lib/gettext.h364952 -Node: autoconf macros367197 -Node: AM_GNU_GETTEXT367974 -Node: AM_GNU_GETTEXT_VERSION371936 -Node: AM_GNU_GETTEXT_NEED372388 -Node: AM_GNU_GETTEXT_INTL_SUBDIR373278 -Node: AM_PO_SUBDIRS373930 -Node: AM_ICONV374712 -Node: CVS Issues376919 -Node: Distributed CVS377507 -Node: Files under CVS379432 -Node: autopoint Invocation382703 -Node: Release Management384543 -Node: Installers385053 -Node: Programming Languages386277 -Node: Language Implementors387100 -Node: Programmers for other Languages391914 -Node: Translators for other Languages392495 -Node: c-format394021 -Node: objc-format395734 -Node: sh-format396086 -Node: python-format396888 -Node: lisp-format397326 -Node: elisp-format397652 -Node: librep-format398142 -Node: scheme-format398542 -Node: smalltalk-format398818 -Node: java-format399318 -Node: csharp-format399766 -Node: awk-format400141 -Node: object-pascal-format400466 -Node: ycp-format400695 -Node: tcl-format401094 -Node: perl-format401389 -Node: php-format402134 -Node: gcc-internal-format402499 -Node: qt-format403541 -Node: boost-format403975 -Node: Maintainers for other Languages404519 -Node: List of Programming Languages405754 -Node: C407037 -Node: sh408337 -Node: Preparing Shell Scripts409611 -Node: gettext.sh413000 -Node: gettext Invocation413547 -Node: ngettext Invocation415302 -Node: envsubst Invocation416890 -Node: eval_gettext Invocation418311 -Node: eval_ngettext Invocation418772 -Node: bash419286 -Node: Python421262 -Node: Common Lisp422412 -Node: clisp C423212 -Node: Emacs Lisp423927 -Node: librep424653 -Node: Scheme425388 -Node: Smalltalk426172 -Node: Java427206 -Node: C#432914 -Node: gawk441331 -Node: Pascal442243 -Node: wxWidgets443551 -Node: YCP444458 -Node: Tcl445197 -Node: Perl446607 -Node: General Problems449615 -Node: Default Keywords453273 -Node: Special Keywords454225 -Node: Quote-like Expressions455738 -Node: Interpolation I458013 -Node: Interpolation II461803 -Node: Parentheses464168 -Node: Long Lines465686 -Node: Perl Pitfalls467531 -Node: PHP471773 -Node: Pike472704 -Node: GCC-source473365 -Node: List of Data Formats474112 -Node: POT474578 -Node: RST474836 -Node: Glade475062 -Node: Conclusion475422 -Node: History475925 -Node: References480191 -Node: Language Codes481835 -Node: Usual Language Codes482347 -Node: Rare Language Codes486718 -Node: Country Codes488375 -Node: Licenses494261 -Node: GNU GPL496103 -Node: GNU LGPL515280 -Node: GNU FDL543413 -Node: Program Index565799 -Node: Option Index567685 -Node: Variable Index613915 -Node: PO Mode Index615453 -Node: Autoconf Macro Index629289 -Node: Index630023 +Node: Top2956 +Node: Introduction17210 +Node: Why18833 +Ref: Why-Footnote-122047 +Node: Concepts22203 +Node: Aspects25624 +Node: Files32158 +Node: Overview34067 +Node: Users44003 +Node: System Installation44914 +Node: Setting the GUI Locale46606 +Node: Setting the POSIX Locale47982 +Node: Locale Names48921 +Node: Locale Environment Variables51326 +Node: The LANGUAGE variable53539 +Node: Installing Localizations55439 +Node: PO Files56794 +Ref: PO Files-Footnote-168222 +Node: Sources68349 +Node: Importing69575 +Node: Triggering70258 +Node: Preparing Strings73458 +Node: Mark Keywords82501 +Node: Marking86814 +Node: c-format Flag94544 +Node: Special cases98463 +Node: Bug Report Address101206 +Node: Names103171 +Node: Libraries106777 +Node: Template109814 +Node: xgettext Invocation110539 +Node: Creating125664 +Node: msginit Invocation126549 +Node: Header Entry129175 +Node: Updating136226 +Node: msgmerge Invocation136441 +Node: Editing141596 +Node: KBabel141954 +Node: Gtranslator142092 +Node: PO Mode142234 +Node: Installation143888 +Node: Main PO Commands145852 +Node: Entry Positioning150940 +Node: Normalizing156408 +Node: Translated Entries160902 +Node: Fuzzy Entries162260 +Node: Untranslated Entries165441 +Node: Obsolete Entries167373 +Node: Modifying Translations170598 +Node: Modifying Comments178567 +Node: Subedit182994 +Node: C Sources Context186890 +Node: Auxiliary192014 +Node: Compendium195230 +Node: Creating Compendia195845 +Node: Using Compendia198329 +Node: Manipulating199269 +Node: msgcat Invocation203097 +Node: msgconv Invocation207623 +Node: msggrep Invocation210802 +Node: msgfilter Invocation216686 +Node: msguniq Invocation222594 +Node: msgcomm Invocation226483 +Node: msgcmp Invocation230528 +Node: msgattrib Invocation232540 +Node: msgen Invocation237225 +Node: msgexec Invocation240560 +Node: Colorizing243139 +Node: The --color option244168 +Node: The TERM variable245800 +Node: The --style option247252 +Node: Style rules248560 +Node: Customizing less255302 +Node: libgettextpo256705 +Node: Binaries261821 +Node: msgfmt Invocation262165 +Node: msgunfmt Invocation269170 +Node: MO Files273332 +Node: Programmers281576 +Node: catgets282758 +Node: Interface to catgets284172 +Node: Problems with catgets286181 +Node: gettext287096 +Node: Interface to gettext288599 +Node: Ambiguities290929 +Node: Locating Catalogs293644 +Ref: Locating Catalogs-Footnote-1294874 +Ref: Locating Catalogs-Footnote-2295100 +Node: Charset conversion295249 +Node: Contexts297703 +Node: Plural forms303209 +Ref: Plural forms-Footnote-1317408 +Node: Optimized gettext317530 +Node: Comparison318869 +Node: Using libintl.a323139 +Node: gettext grok323582 +Node: Temp Programmers326223 +Node: Temp Implementations326751 +Node: Temp catgets328131 +Node: Temp WSI329832 +Node: Temp Notes331834 +Node: Translators332337 +Node: Trans Intro 0332800 +Node: Trans Intro 1335549 +Node: Discussions337513 +Node: Organization341171 +Node: Central Coordination343247 +Node: National Teams344390 +Node: Sub-Cultures346917 +Node: Organizational Ideas347854 +Node: Mailing Lists348875 +Node: Information Flow350698 +Node: Prioritizing messages352949 +Node: Maintainers357248 +Node: Flat and Non-Flat359204 +Node: Prerequisites360697 +Node: gettextize Invocation364854 +Node: Adjusting Files372263 +Node: po/POTFILES.in374050 +Node: po/LINGUAS375299 +Node: po/Makevars376991 +Node: po/Rules-*377933 +Node: configure.ac379404 +Node: config.guess382418 +Node: mkinstalldirs383773 +Node: aclocal384178 +Node: acconfig386162 +Node: config.h.in386662 +Node: Makefile388130 +Node: src/Makefile390727 +Node: lib/gettext.h395117 +Node: autoconf macros397365 +Node: AM_GNU_GETTEXT398207 +Node: AM_GNU_GETTEXT_VERSION402172 +Node: AM_GNU_GETTEXT_NEED402627 +Node: AM_GNU_GETTEXT_INTL_SUBDIR403520 +Node: AM_PO_SUBDIRS404175 +Node: AM_XGETTEXT_OPTION404970 +Node: AM_ICONV405840 +Node: CVS Issues408055 +Node: Distributed CVS408646 +Node: Files under CVS410574 +Node: autopoint Invocation413848 +Node: Release Management415688 +Node: Installers416201 +Node: Programming Languages417428 +Node: Language Implementors418254 +Node: Programmers for other Languages423082 +Node: Translators for other Languages423666 +Node: c-format425246 +Node: objc-format426965 +Node: sh-format427320 +Node: python-format428125 +Node: lisp-format428566 +Node: elisp-format428895 +Node: librep-format429388 +Node: scheme-format429791 +Node: smalltalk-format430070 +Node: java-format430573 +Node: csharp-format431024 +Node: awk-format431402 +Node: object-pascal-format431730 +Node: ycp-format431962 +Node: tcl-format432364 +Node: perl-format432662 +Node: php-format433410 +Node: gcc-internal-format433778 +Node: qt-format434823 +Node: kde-format435258 +Node: boost-format435664 +Node: Maintainers for other Languages436212 +Node: List of Programming Languages437450 +Node: C438733 +Node: sh440033 +Node: Preparing Shell Scripts441307 +Node: gettext.sh444699 +Node: gettext Invocation445249 +Node: ngettext Invocation447004 +Node: envsubst Invocation448592 +Node: eval_gettext Invocation450013 +Node: eval_ngettext Invocation450474 +Node: bash450988 +Node: Python452967 +Node: Common Lisp454117 +Node: clisp C454917 +Node: Emacs Lisp455632 +Node: librep456358 +Node: Scheme457093 +Node: Smalltalk457877 +Node: Java458911 +Node: C#464707 +Node: gawk473933 +Node: Pascal474845 +Node: wxWidgets476153 +Node: YCP477060 +Node: Tcl477799 +Node: Perl479209 +Node: General Problems482217 +Node: Default Keywords485878 +Node: Special Keywords486833 +Node: Quote-like Expressions488349 +Node: Interpolation I490627 +Node: Interpolation II494420 +Node: Parentheses496788 +Node: Long Lines498309 +Node: Perl Pitfalls500157 +Node: PHP504402 +Node: Pike505333 +Node: GCC-source505994 +Node: List of Data Formats506741 +Node: POT507210 +Node: RST507468 +Node: Glade507694 +Node: Conclusion508054 +Node: History508560 +Node: References512830 +Node: Language Codes514477 +Node: Usual Language Codes514992 +Node: Rare Language Codes519366 +Node: Country Codes521026 +Node: Licenses526915 +Node: GNU GPL528760 +Node: GNU LGPL547943 +Node: GNU FDL576082 +Node: Program Index598471 +Node: Option Index600357 +Node: Variable Index647235 +Node: PO Mode Index650142 +Node: Autoconf Macro Index663978 +Node: Index664785  End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/gettext-tools/doc/gettext_1.html b/gettext-tools/doc/gettext_1.html index 227afdf20..005e3a8e8 100644 --- a/gettext-tools/doc/gettext_1.html +++ b/gettext-tools/doc/gettext_1.html @@ -1,7 +1,7 @@ + from gettext.texi on 4 November 2007 --> GNU gettext utilities - 1 Introduction @@ -63,7 +63,7 @@ Please include the manual's edition number and update date in your messages.

Usually, programs are written and documented in English, and use English at execution time to interact with users. This is true -not only of GNU software, but also of a great deal of commercial +not only of GNU software, but also of a great deal of proprietary and free software. Using a common language is quite handy for communication between developers, maintainers and users from all countries. On the other hand, most people are less comfortable with @@ -174,7 +174,7 @@ by which the programs are untied from calling only English strings or other English specific habits, and connected to generic ways of doing the same, instead. Program developers may use various techniques to internationalize their programs. Some of these have been standardized. -GNU gettext offers one of these standards. See section 11 The Programmer's View. +GNU gettext offers one of these standards. See section 11 The Programmer's View.

@@ -391,8 +391,22 @@ the user.

+These areas of cultural conventions are called locale categories. +It is an unfortunate term; locale aspects or locale feature +categories would be a better term, because each “locale category” +describes an area or task that requires localization. The concrete data +that describes the cultural conventions for such an area and for a particular +culture is also called a locale category. In this sense, a locale +is composed of several locale categories: the locale category describing +the codeset, the locale category describing the formatting of numbers, +the locale category containing the translated messages, and so on. + +

+

+ Components of locale outside of message handling are standardized in -the ISO C standard and the SUSV2 specification. GNU libc +the ISO C standard and the POSIX:2001 standard (also known as the SUSV3 +specification). GNU libc fully implements this, and most other modern systems provide a more or less reasonable support for at least some of the missing components. @@ -402,7 +416,7 @@ or less reasonable support for at least some of the missing components.

1.4 Files Conveying Translations

- + The letters PO in ‘.po’ files means Portable Object, to distinguish it from ‘.mo’ files, where MO stands for Machine Object. This paradigm, as well as the PO file format, is inspired @@ -444,9 +458,9 @@ the GNU format.

1.5 Overview of GNU gettext

- + The following diagram summarizes the relation between the files handled by GNU gettext and the tools acting on these files. It is followed by somewhat detailed explanations, which you should @@ -455,8 +469,7 @@ of these interrelations will surely help programmers, translators and maintainers.

- -
+@example
 @group
 Original C Sources ───> Preparation ───> Marked C Sources ───╮
                                                              │
@@ -479,17 +492,17 @@ Original C Sources ───> Preparation ───> Marked C Sources ───
 │                                              ├───> "Hello world!"
 ╰───────> install ───> /.../bin/PROGRAM ───────╯
 @end group
-
+@end example

- + As a programmer, the first step to bringing GNU gettext into your package is identifying, right in the C sources, those strings which are meant to be translatable, and those which are untranslatable. This tedious job can be done a little more comfortably using emacs PO mode, but you can use any means familiar to you for modifying your C sources. Beside this some other simple, standard changes are needed to -properly initialize the translation library. See section 4 Preparing Program Sources, for +properly initialize the translation library. See section 4 Preparing Program Sources, for more information about all this.

@@ -515,7 +528,7 @@ simply replace these definitions by the following:

- + 

 #include <libintl.h>
@@ -525,8 +538,8 @@ simply replace these definitions by the following:

- + and link against ‘libintl.a’ or ‘libintl.so’. Note that on GNU systems, you don't need to link with libintl because the gettext library functions are already contained in GNU libc. @@ -534,8 +547,8 @@ That is all you have to change.

- + Once the C sources have been modified, the xgettext program is used to find and extract all translatable strings, and create a PO template file out of all these. This ‘package.pot’ file @@ -543,10 +556,10 @@ contains all original program strings. It has sets of pointers to exactly where in C sources each string is used. All translations are set to empty. The letter t in ‘.pot’ marks this as a Template PO file, not yet oriented towards any particular language. -See section 5.1 Invoking the xgettext Program, for more details about how one calls the +See section 5.1 Invoking the xgettext Program, for more details about how one calls the xgettext program. If you are really lazy, you might be interested at working a lot more right away, and preparing the -whole distribution setup (see section 13 The Maintainer's View). By doing so, you +whole distribution setup (see section 13 The Maintainer's View). By doing so, you spare yourself typing the xgettext command, as make should now generate the proper things automatically for you! @@ -555,7 +568,7 @@ should now generate the proper things automatically for you! The first time through, there is no ‘lang.po’ yet, so the msgmerge step may be skipped and replaced by a mere copy of ‘package.pot’ to ‘lang.po’, where lang -represents the target language. See section 6 Creating a New PO File for details. +represents the target language. See section 6 Creating a New PO File for details.

@@ -563,7 +576,7 @@ Then comes the initial translation of messages. Translation in itself is a whole matter, still exclusively meant for humans, and whose complexity far overwhelms the level of this manual. Nevertheless, a few hints are given in some other chapter of this -manual (see section 12 The Translator's View). You will also find there indications +manual (see section 12 The Translator's View). You will also find there indications about how to contact translating teams, or becoming part of them, for sharing your translating concerns with others who target the same native language. @@ -572,9 +585,9 @@ native language.

While adding the translated messages into the ‘lang.po’ PO file, if you are not using one of the dedicated PO file editors -(see section 8 Editing PO Files), you are on your own +(see section 8 Editing PO Files), you are on your own for ensuring that your efforts fully respect the PO file format, and quoting -conventions (see section 3 The Format of PO Files). This is surely not an impossible task, +conventions (see section 3 The Format of PO Files). This is surely not an impossible task, as this is the way many people have handled PO files around 1995. On the other hand, by using a PO file editor, most details of PO file format are taken care of for you, but you have to acquire @@ -585,7 +598,7 @@ some familiarity with PO file editor itself. If some common translations have already been saved into a compendium PO file, translators may use PO mode for initializing untranslated entries from the compendium, and also save selected translations into -the compendium, updating it (see section 8.3.14 Using Translation Compendia). Compendium files +the compendium, updating it (see section 8.4 Using Translation Compendia). Compendium files are meant to be exchanged between members of a given translation team.

@@ -613,7 +626,7 @@ are slowly fading out of date.

- + It is important for translators (and even maintainers) to understand that package translation is a continuous process in the lifetime of a package, and not something which is done once and for all at the start. @@ -631,8 +644,8 @@ out of recent C sources. The refreshing operation adjusts all references to C source locations for strings, since these strings move as programs are modified. Also, msgmerge comments out as obsolete, in ‘lang.po’, those already translated entries -which are no longer used in the program sources (see section 8.3.8 Obsolete Entries). It finally discovers new strings and inserts them in -the resulting PO file as untranslated entries (see section 8.3.7 Untranslated Entries). See section 7.1 Invoking the msgmerge Program, for more information about what +which are no longer used in the program sources (see section 8.3.8 Obsolete Entries). It finally discovers new strings and inserts them in +the resulting PO file as untranslated entries (see section 8.3.7 Untranslated Entries). See section 7.1 Invoking the msgmerge Program, for more information about what msgmerge really does.

@@ -662,7 +675,7 @@ distribution. Once the PO file is complete and dependable, the msgfmt program is used for turning the PO file into a machine-oriented format, which may yield efficient retrieval of translations by the programs of the -package, whenever needed at runtime (see section 10.3 The Format of GNU MO Files). See section 10.1 Invoking the msgfmt Program, for more information about all modes of execution +package, whenever needed at runtime (see section 10.3 The Format of GNU MO Files). See section 10.1 Invoking the msgfmt Program, for more information about all modes of execution for the msgfmt program.

@@ -672,8 +685,8 @@ with the GNU gettext library, usually through the operation of make, given a suitable ‘Makefile’ exists for the project, and the resulting executable is installed somewhere users will find it. The MO files themselves should also be properly installed. Given the -appropriate environment variables are set (see section 2.2 Magic for End Users), the -program should localize itself automatically, whenever it executes. +appropriate environment variables are set (see section 2.3 Setting the Locale through Environment Variables), +the program should localize itself automatically, whenever it executes.

diff --git a/gettext-tools/doc/gettext_10.html b/gettext-tools/doc/gettext_10.html index 58290c8b1..e05e61c85 100644 --- a/gettext-tools/doc/gettext_10.html +++ b/gettext-tools/doc/gettext_10.html @@ -1,7 +1,7 @@ + from gettext.texi on 4 November 2007 --> GNU gettext utilities - 10 Producing Binary MO Files @@ -11,29 +11,29 @@ Go to the first, previous<

-

10 Producing Binary MO Files

+

10 Producing Binary MO Files

-

10.1 Invoking the msgfmt Program

+

10.1 Invoking the msgfmt Program

- - + + 

 msgfmt [option] filename.po ...

- + The msgfmt programs generates a binary message catalog from a textual translation description.

-

10.1.1 Input file location

+

10.1.1 Input file location

@@ -43,8 +43,8 @@ translation description.
‘--directory=directory’
- - + + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though. @@ -57,7 +57,7 @@ If an input file is ‘-’, standard input is read.

-

10.1.2 Operation mode

+

10.1.2 Operation mode

@@ -65,46 +65,46 @@ If an input file is ‘-’, standard input is read.
‘--java’
- - - + + + Java mode: generate a Java ResourceBundle class.
‘--java2’
- + Like --java, and assume Java2 (JDK 1.2 or higher).
‘--csharp’
- - + + C# mode: generate a .NET .dll file containing a subclass of GettextResourceSet.
‘--csharp-resources’
- - + + C# resources mode: generate a .NET ‘.resources’ file.
‘--tcl’
- - + + Tcl mode: generate a tcl/msgcat ‘.msg’ file.
‘--qt’
- - + + Qt mode: generate a Qt ‘.qm’ file.
-

10.1.3 Output file location

+

10.1.3 Output file location

@@ -112,13 +112,13 @@ Qt mode: generate a Qt ‘.qm’ file.
‘--output-file=file’
- - + + Write output to specified file.
‘--strict’
- + Direct the program to work strictly following the Uniforum/Sun implementation. Currently this only affects the naming of the output file. If this option is not given the name of the output file is the @@ -137,7 +137,7 @@ If the output file is ‘-’, output is written

-

10.1.4 Output file location in Java mode

+

10.1.4 Output file location in Java mode

@@ -145,22 +145,22 @@ If the output file is ‘-’, output is written
‘--resource=resource’
- - + + Specify the resource name.
‘-l locale’
‘--locale=locale’
- - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC.
‘-d directory’
- + Specify the base directory of classes directory hierarchy.
@@ -173,7 +173,7 @@ is written under the specified directory.

-

10.1.5 Output file location in C# mode

+

10.1.5 Output file location in C# mode

@@ -181,22 +181,22 @@ is written under the specified directory.
‘--resource=resource’
- - + + Specify the resource name.
‘-l locale’
‘--locale=locale’
- - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC.
‘-d directory’
- + Specify the base directory for locale dependent ‘.dll’ files.
@@ -209,7 +209,7 @@ locale.

-

10.1.6 Output file location in Tcl mode

+

10.1.6 Output file location in Tcl mode

@@ -217,14 +217,14 @@ locale.
‘--locale=locale’
- - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC.
‘-d directory’
- + Specify the base directory of ‘.msg’ message catalogs.
@@ -236,7 +236,7 @@ written in the specified directory.

-

10.1.7 Input file syntax

+

10.1.7 Input file syntax

@@ -244,14 +244,14 @@ written in the specified directory.
‘--properties-input’
- - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax.
‘--stringtable-input’
- + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -259,7 +259,7 @@ Assume the input files are NeXTstep/GNUstep localized resource files in -

10.1.8 Input file interpretation

+

10.1.8 Input file interpretation

@@ -267,15 +267,15 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
‘--check’
- - + + Perform all the checks implied by --check-format, --check-header, --check-domain.
‘--check-format’
- - + + Check language dependent format strings. If the string represents a format string used in a @@ -294,19 +294,19 @@ used in a printf-like function and so msgfmt might rep errors where there are none. To solve this problem the programmer can dictate the decision to the -xgettext program (see section 15.3.1 C Format Strings). The translator should not +xgettext program (see section 15.3.1 C Format Strings). The translator should not consider removing the flag from the #, line. This "fix" would be reversed again as soon as msgmerge is called the next time.
‘--check-header’
- -Verify presence and contents of the header entry. See section 6.2 Filling in the Header Entry, + +Verify presence and contents of the header entry. See section 6.2 Filling in the Header Entry, for a description of the various fields in the header entry.
‘--check-domain’
- + Check for conflicts between domain directives and the --output-file option @@ -314,18 +314,18 @@ option
‘--check-compatibility’
- - - + + + Check that GNU msgfmt behaves like X/Open msgfmt. This will give an error when attempting to use the GNU extensions.
‘--check-accelerators[=char]’
- - - - + + + + Check presence of keyboard accelerators for menu items. This is based on the convention used in some GUIs that a keyboard accelerator in a menu item string is designated by an immediately preceding ‘&’ character. @@ -340,9 +340,9 @@ instead of ‘&’.
‘--use-fuzzy’
- - - + + + Use fuzzy entries in output. Note that using this option is usually wrong, because fuzzy messages are exactly those which have not been validated by a human translator. @@ -351,7 +351,7 @@ a human translator. -

10.1.9 Output details

+

10.1.9 Output details

@@ -359,13 +359,13 @@ a human translator.
‘--alignment=number’
- - + + Align strings to number bytes (default: 1).
‘--no-hash’
- + Don't include a hash table in the binary file. Lookup will be more expensive at run time (binary search instead of hash table lookup). @@ -373,7 +373,7 @@ at run time (binary search instead of hash table lookup). -

10.1.10 Informative output

+

10.1.10 Informative output

@@ -381,54 +381,54 @@ at run time (binary search instead of hash table lookup).
‘--help’
- - + + Display this help and exit.
‘-V’
‘--version’
- - + + Output version information and exit.
‘--statistics’
- + Print statistics about translations.
‘-v’
‘--verbose’
- - + + Increase verbosity level.
-

10.2 Invoking the msgunfmt Program

+

10.2 Invoking the msgunfmt Program

- - + + 

 msgunfmt [option] [file]...

- + The msgunfmt program converts a binary message catalog to a Uniforum style .po file.

-

10.2.1 Operation mode

+

10.2.1 Operation mode

@@ -436,35 +436,35 @@ Uniforum style .po file.
‘--java’
- - - + + + Java mode: input is a Java ResourceBundle class.
‘--csharp’
- - + + C# mode: input is a .NET .dll file containing a subclass of GettextResourceSet.
‘--csharp-resources’
- - + + C# resources mode: input is a .NET ‘.resources’ file.
‘--tcl’
- - + + Tcl mode: input is a tcl/msgcat ‘.msg’ file.
-

10.2.2 Input file location

+

10.2.2 Input file location

@@ -480,7 +480,7 @@ If no input file is given or if it is ‘-’, s

-

10.2.3 Input file location in Java mode

+

10.2.3 Input file location in Java mode

@@ -488,16 +488,16 @@ If no input file is given or if it is ‘-’, s
‘--resource=resource’
- - + + Specify the resource name.
‘-l locale’
‘--locale=locale’
- - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC. @@ -510,7 +510,7 @@ separated with an underscore. The class is located using the CLASSPATH -

10.2.4 Input file location in C# mode

+

10.2.4 Input file location in C# mode

@@ -518,22 +518,22 @@ separated with an underscore. The class is located using the CLASSPATH
‘--resource=resource’
- - + + Specify the resource name.
‘-l locale’
‘--locale=locale’
- - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC.
‘-d directory’
- + Specify the base directory for locale dependent ‘.dll’ files.
@@ -546,7 +546,7 @@ locale.

-

10.2.5 Input file location in Tcl mode

+

10.2.5 Input file location in Tcl mode

@@ -554,14 +554,14 @@ locale.
‘--locale=locale’
- - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC.
‘-d directory’
- + Specify the base directory of ‘.msg’ message catalogs.
@@ -573,7 +573,7 @@ located in the specified directory.

-

10.2.6 Output file location

+

10.2.6 Output file location

@@ -581,8 +581,8 @@ located in the specified directory.
‘--output-file=file’
- - + + Write output to specified file.
@@ -594,26 +594,26 @@ or if it is ‘-’.

-

10.2.7 Output details

+

10.2.7 Output details

‘--force-po’
- + Always write an output file even if it contains no message.
‘-i’
‘--indent’
- - + + Write the .po file using indented style.
‘--strict’
- + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -622,15 +622,15 @@ GNU extensions.
‘--properties-output’
- - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages.
‘--stringtable-output’
- + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -638,15 +638,15 @@ Note that this file format doesn't support plural forms.
‘--width=number’
- - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
‘--no-wrap’
- + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -655,9 +655,9 @@ lines which are wider than the output page width will be split.
‘--sort-output’
- - - + + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -665,7 +665,7 @@ for the translator to understand each message's context. -

10.2.8 Informative output

+

10.2.8 Informative output

@@ -673,34 +673,34 @@ for the translator to understand each message's context.
‘--help’
- - + + Display this help and exit.
‘-V’
‘--version’
- - + + Output version information and exit.
‘-v’
‘--verbose’
- - + + Increase verbosity level.
-

10.3 The Format of GNU MO Files

+

10.3 The Format of GNU MO Files

- - + +

@@ -709,7 +709,7 @@ which appears below.

- + The first two words serve the identification of the file. The magic number will always signal GNU MO files. The number is stored in the byte order of the generating machine, so the magic number really is @@ -757,7 +757,7 @@ translated tables, making the system information very easy to find.

- + The size S of the hash table can be zero. In this case, the hash table itself is not contained in the MO file. Some people might prefer this because a precomputed hashing table takes disk space, and @@ -778,13 +778,13 @@ machines, a correct alignment will speed things up.

- + Contexts are stored by storing the concatenation of the context, a EOT byte, and the original string, instead of the original string.

- + Plural forms are stored by letting the plural of the original string follow the singular of the original string, separated through a NUL byte. The length which appears in the string descriptor diff --git a/gettext-tools/doc/gettext_11.html b/gettext-tools/doc/gettext_11.html index 1f53477bd..3a05e9889 100644 --- a/gettext-tools/doc/gettext_11.html +++ b/gettext-tools/doc/gettext_11.html @@ -1,7 +1,7 @@ + from gettext.texi on 4 November 2007 --> GNU gettext utilities - 11 The Programmer's View @@ -11,7 +11,7 @@ Go to the first, previous

-

11 The Programmer's View

+

11 The Programmer's View

One aim of the current message catalog implementation provided by @@ -29,9 +29,9 @@ later explain our solution of this dilemma. -

11.1 About catgets

+

11.1 About catgets

- +

@@ -64,9 +64,9 @@ therefore part of all Unix implementation (implementations, which are -

11.1.1 The Interface

+

11.1.1 The Interface

- +

@@ -79,7 +79,7 @@ for the functions and the needed definitions are in the

- + catopen is used like in this:

@@ -98,7 +98,7 @@ message catalog, equivalent to handles to file returned by open.

- + This handle is of course used in the catgets function which can be used like this: @@ -130,7 +130,7 @@ should better be const char *, but the standard is published in

- + The last of these functions is used and behaves as expected:

@@ -145,9 +145,9 @@ After this no catgets call using the descriptor is legal anymore.

-

11.1.2 Problems with the catgets Interface?!

+

11.1.2 Problems with the catgets Interface?!

- +

@@ -166,9 +166,9 @@ more easy to manage.

-

11.2 About gettext

+

11.2 About gettext

- +

@@ -183,7 +183,7 @@ The main point about this solution is that it does not follow the method of normal file handling (open-use-close) and that it does not burden the programmer with so many tasks, especially the unique key handling. Of course here also a unique key is needed, but this key is the message -itself (how long or short it is). See section 11.3 Comparing the Two Interfaces for a more +itself (how long or short it is). See section 11.3 Comparing the Two Interfaces for a more detailed comparison of the two methods.

@@ -197,9 +197,9 @@ in using this library will be interested in this description. -

11.2.1 The Interface

+

11.2.1 The Interface

- +

@@ -251,8 +251,8 @@ returned. If the argument is NULL the result is undefined.

One thing which should come into mind is that no explicit dependency to -the used domain is given. The current value of the domain for the -LC_MESSAGES locale is used. If this changes between two +the used domain is given. The current value of the domain is used. +If this changes between two executions of the same gettext call in the program, both calls reference a different message catalog. @@ -268,11 +268,11 @@ your language.

-

11.2.2 Solving Ambiguities

+

11.2.2 Solving Ambiguities

- - - + + +

@@ -303,7 +303,7 @@ char *dcgettext (const char *domain_name, const char *msgid,

Both take an additional argument at the first place, which corresponds to the argument of textdomain. The third argument of -dcgettext allows to use another locale but LC_MESSAGES. +dcgettext allows to use another locale category but LC_MESSAGES. But I really don't know where this can be useful. If the domain_name is NULL or category has an value beside the known ones, the result is undefined. It should also be noted that @@ -346,9 +346,9 @@ unreliabilities.

-

11.2.3 Locating Message Catalog Files

+

11.2.3 Locating Message Catalog Files

- +

@@ -357,8 +357,8 @@ stored we need some way to add these information to file message catalog files. The way usually used in Unix environments is have this encoding in the file name. This is also done here. The directory name given in bindtextdomains second argument (or the default directory), -followed by the value and name of the locale and the domain name are -concatenated: +followed by the name of the locale, the locale category, and the domain name +are concatenated:

@@ -375,21 +375,22 @@ library, and for packages adhering to its conventions, it's:

-locale is the value of the locale whose name is this +locale is the name of the locale category which is designated by LC_category. For gettext and dgettext this LC_category is always LC_MESSAGES.(3) -The value of the locale is determined through +The name of the locale category is determined through setlocale (LC_category, NULL). (4) -dcgettext specifies the locale category by the third argument. +When using the function dcgettext, you can specify the locale category +through the third argument.

-

11.2.4 How to specify the output character set gettext uses

+

11.2.4 How to specify the output character set gettext uses

- - + +

@@ -421,7 +422,7 @@ recommended that all msgids be US-ASCII strings.

Function: char * bind_textdomain_codeset (const char *domainname, const char *codeset) -
+
The bind_textdomain_codeset function can be used to specify the output character set for message catalogs for domain domainname. The codeset argument must be a valid codeset name which can be used @@ -453,12 +454,12 @@ global variable errno is set accordingly.

-

11.2.5 Using contexts for solving ambiguities

+

11.2.5 Using contexts for solving ambiguities

- - - - + + + +

@@ -496,7 +497,7 @@ over the functions from <libintl.h>.

- + 

 const char *pgettext (const char *msgctxt, const char *msgid);
@@ -531,8 +532,8 @@ fetches a particular translation of the msgid.
 
 

 

-
-
+
+
 
 
 const char *dpgettext (const char *domain_name,
@@ -546,7 +547,7 @@ const char *dcpgettext (const char *domain_name,
 These are generalizations of pgettext.  They behave similarly to
 dgettext and dcgettext, respectively.  The domain_name
 argument defines the translation domain.  The category argument
-allows to use another locale facet than LC_MESSAGES.
+allows to use another locale category than LC_MESSAGES.
 
 

 

@@ -617,9 +618,9 @@ string literals, more general macros are available:
 
 

 

-
-
-
+
+
+
 
 
 const char *pgettext_expr (const char *msgctxt, const char *msgid);
@@ -639,9 +640,9 @@ efficient.
 

 
 
-
11.2.6  Additional functions for plural forms

+
11.2.6  Additional functions for plural forms

 

-
+
 
 

 

@@ -764,7 +765,7 @@ purpose.
 

 

 
Function: char * ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
-

+

 The ngettext function is similar to the gettext function
 as it finds the message catalogs in the same way.  But it takes two
 extra arguments.  The msgid1 parameter must contain the singular
@@ -825,7 +826,7 @@ In this case the number n is only used to choose the plural form.
 

 

 
Function: char * dngettext (const char *domain, const char *msgid1, const char *msgid2, unsigned long int n)
-

+

 The dngettext is similar to the dgettext function in the
 way the message catalog is selected.  The difference is that it takes
 two extra parameter to provide the correct plural form.  These two
@@ -836,7 +837,7 @@ parameters are handled in the same way ngettext handles them.
 

 

 
Function: char * dcngettext (const char *domain, const char *msgid1, const char *msgid2, unsigned long int n, int category)
-

+

 The dcngettext is similar to the dcgettext function in the
 way the message catalog is selected.  The difference is that it takes
 two extra parameter to provide the correct plural form.  These two
@@ -861,9 +862,9 @@ possibility of extensions to not prevent the use of new languages).
 
 

 

-
-
-
+
+
+
 The information about the plural form selection has to be stored in the
 header entry of the PO file (the one with the empty msgid string).
 The plural form information looks like this:
@@ -891,7 +892,7 @@ value of nplurals.
 
 

 

-
+
 The following rules are known at this point.  The language with families
 are listed.  But this does not necessarily mean the information can be
 generalized for the whole family (as can be easily seen in the table
@@ -1206,9 +1207,9 @@ is acceptable in English, and similarly for other languages.
 

 
 
-
11.2.7  Optimization of the *gettext functions

+
11.2.7  Optimization of the *gettext functions

 

-
+
 
 

 

@@ -1261,10 +1262,10 @@ find the result through a single cache lookup.
 

 
 
-
11.3  Comparing the Two Interfaces

+
11.3  Comparing the Two Interfaces

 

-
-
+
+
 
 

 
@@ -1314,7 +1315,7 @@ by
 
 

 

-
+
 
 
 #include <libintl.h>
@@ -1329,9 +1330,9 @@ can use any that becomes available.
 
 

 

-
+
 The same procedure can be done for the gettext_noop invocations
-(see section 4.7  Special Cases of Translatable Strings).  One usually defines gettext_noop as a
+(see section 4.7  Special Cases of Translatable Strings).  One usually defines gettext_noop as a
 no-op macro.  So you should consider the following code for your project:
 
 

@@ -1408,12 +1409,12 @@ little bit.  But it is not impossible to overcome.
 

 catgets allows same original entry to have different translations,
 but gettext has another, scalable approach for solving ambiguities
-of this kind: See section 11.2.2  Solving Ambiguities.
+of this kind: See section 11.2.2  Solving Ambiguities.
 
 

 
 
-
11.4  Using libintl.a in own programs

+
11.4  Using libintl.a in own programs

 
 

 Starting with version 0.9.4 the library libintl.h should be
@@ -1424,7 +1425,7 @@ and the library in directories selected using the $(prefix).
 

 
 
-
11.5  Being a gettext grok

+
11.5  Being a gettext grok

 
 

  NOTE:  This documentation section is outdated and needs to be
@@ -1442,7 +1443,7 @@ is a list comments:
 
    
 
  • Changing the language at runtime
 
-
+
 
 For interactive programs it might be useful to offer a selection of the
 used language at runtime.  To understand how to do this one need to know
@@ -1459,20 +1460,20 @@ priority:
 
      
 
    1. LANGUAGE
 
-
+
  
-
+
 
    2. LC_ALL
 
-
-
-
-
-
-
-
    3. LC_xxx, according to selected locale
+
+
+
+
+
+
+
    4. LC_xxx, according to selected locale category
 
-
+
 
    5. LANG
 
 
    
@@ -1490,7 +1491,7 @@ But there is one little hook.  The code for gcc-2.7.0 and up provides
 some optimization.  This optimization normally prevents the calling of
 the dcgettext function as long as no new catalog is loaded.  But
 if dcgettext is not called the program also cannot find the
-LANGUAGE variable be changed (see section 11.2.7  Optimization of the *gettext functions).  A
+LANGUAGE variable be changed (see section 11.2.7  Optimization of the *gettext functions).  A
 solution for this is very easy.  Include the following code in the
 language switching function.
 
@@ -1506,7 +1507,7 @@ language switching function.
   }
 

 
-
+
 The variable _nl_msg_cat_cntr is defined in ‘loadmsgcat.c’.
 You don't need to know what this is for.  But it can be used to detect
 whether a gettext implementation is GNU gettext and not non-GNU
@@ -1516,7 +1517,7 @@ system's native gettext implementation.
 
 
 
-
11.6  Temporary Notes for the Programmers Chapter

+
11.6  Temporary Notes for the Programmers Chapter

 
 

  NOTE:  This documentation section is outdated and needs to be
@@ -1526,7 +1527,7 @@ revised.
 
 
 
-
11.6.1  Temporary - Two Possible Implementations

+
11.6.1  Temporary - Two Possible Implementations

 
 

 There are two competing methods for language independent messages:
@@ -1558,7 +1559,7 @@ see the Programming for Internationalization FAQ.
 

 
 
-
11.6.2  Temporary - About catgets

+
11.6.2  Temporary - About catgets

 
 

 There have been a few discussions of late on the use of
@@ -1603,7 +1604,7 @@ of all Unix systems.
 

 
 
-
11.6.3  Temporary - Why a single implementation

+
11.6.3  Temporary - Why a single implementation

 
 

 Now it seems kind of wasteful to me to have two different systems
@@ -1634,7 +1635,7 @@ access routines) with their software instead of just including the
 

 

 Message catalog support is however only the tip of the iceberg.
-What about the data for the other locale categories.  They also have
+What about the data for the other locale categories?  They also have
 a number of deficiencies.  Are we going to abandon them as well and
 develop another duplicate set of routines (should libintl
 expand beyond message catalog support)?
@@ -1648,7 +1649,7 @@ the future.
 

 
 
-
11.6.4  Temporary - Notes

+
11.6.4  Temporary - Notes

 
 

 X/Open agreed very late on the standard form so that many
diff --git a/gettext-tools/doc/gettext_12.html b/gettext-tools/doc/gettext_12.html
index e6f5f7d39..ed80aedf3 100644
--- a/gettext-tools/doc/gettext_12.html
+++ b/gettext-tools/doc/gettext_12.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - 12  The Translator's View
@@ -11,11 +11,11 @@ Go to the first, previous
 

 
 
-
12  The Translator's View

+
12  The Translator's View

 
 
 
-
12.1  Introduction 0

+
12.1  Introduction 0

 
 

  NOTE:  This documentation section is outdated and needs to be
@@ -81,7 +81,7 @@ subscribe
 Keep in mind that team members should be interested in working
 at translations, or at solving translational difficulties, rather than
 merely lurking around.  If your team does not exist yet and you want to
-start one, please write to ‘translation@iro.umontreal.ca’;
+start one, please write to ‘coordinator@translationproject.org’;
 you will then reach the coordinator for all translator teams.
 
 

@@ -92,13 +92,13 @@ teams have begun to organize, using these packages as a starting
 point.  But there are many more packages and many languages for
 which we have no volunteer translators.  If you would like to
 volunteer to work at translating messages, please send mail to
-‘translation@iro.umontreal.ca’ indicating what language(s)
+‘coordinator@translationproject.org’ indicating what language(s)
 you can work on.
 
 

 
 
-
12.2  Introduction 1

+
12.2  Introduction 1

 
 

  NOTE:  This documentation section is outdated and needs to be
@@ -119,7 +119,7 @@ teams have begun to organize, using these packages as a starting
 point.  But there are many more packages and many languages
 for which we have no volunteer translators.  If you'd like to
 volunteer to work at translating messages, please send mail to
-‘translation@iro.umontreal.ca’ indicating what language(s)
+‘coordinator@translationproject.org’ indicating what language(s)
 you can work on.
 
 
@@ -148,12 +148,12 @@ internationalization of free software is dedicated to succeed.
 

 

 For suggestion clarifications, additions or corrections to this
-document, please e-mail to ‘translation@iro.umontreal.ca’.
+document, please e-mail to ‘coordinator@translationproject.org’.
 
 

 
 
-
12.3  Discussions

+
12.3  Discussions

 
 

  NOTE:  This documentation section is outdated and needs to be
@@ -236,7 +236,7 @@ software.
 
 
 
-
12.4  Organization

+
12.4  Organization

 
 

  NOTE:  This documentation section is outdated and needs to be
@@ -277,7 +277,7 @@ become a permanent and continuous activity in the free software community,
 once well started.
 The setup should be minimally completed and tested before GNU
 gettext becomes an official reality.  The e-mail address
-‘translation@iro.umontreal.ca’ has been setup for receiving
+‘coordinator@translationproject.org’ has been set up for receiving
 offers from volunteers and general e-mail on these topics.  This address
 reaches the Translation Project coordinator.
 
@@ -285,10 +285,10 @@ reaches the Translation Project coordinator.
 
 
 
-
12.4.1  Central Coordination

+
12.4.1  Central Coordination

 
 

-I also think GNU will need sooner than it thinks, that someone setup
+I also think GNU will need sooner than it thinks, that someone set up
 a way to organize and coordinate these groups.  Some kind of group
 of groups.  My opinion is that it would be good that GNU delegates
 this task to a small group of collaborating volunteers, shortly.
@@ -310,7 +310,7 @@ overwhelming task, the time to put delegations in place.
 

 
 
-
12.4.2  National Teams

+
12.4.2  National Teams

 
 

 I suggest we look for volunteer coordinators/editors for individual
@@ -373,7 +373,7 @@ consistent.
 
 
 
-
12.4.2.1  Sub-Cultures

+
12.4.2.1  Sub-Cultures

 
 

 Taking French for example, there are a few sub-cultures around computers
@@ -395,7 +395,7 @@ means soon!
 

 
 
-
12.4.2.2  Organizational Ideas

+
12.4.2.2  Organizational Ideas

 
 

 I expect the next big changes after the official release.  Please note
@@ -432,7 +432,7 @@ this also seems to work).
 
 
 
-
12.4.3  Mailing Lists

+
12.4.3  Mailing Lists

 
 

 If we get any inquiries about GNU gettext, send them on to:
@@ -440,7 +440,7 @@ If we get any inquiries about GNU gettext, send them on to:
 

 
 
-‘translation@iro.umontreal.ca’
+‘coordinator@translationproject.org’
 

 
 

@@ -486,7 +486,7 @@ subscribe as they see fit, as long as each team is represented in it.
 

 
 
-
12.5  Information Flow

+
12.5  Information Flow

 
 

  NOTE:  This documentation section is outdated and needs to be
@@ -540,7 +540,7 @@ have more information about this.
 

 
 
-
12.6  Prioritizing messages: How to determine which messages to translate first

+
12.6  Prioritizing messages: How to determine which messages to translate first

 
 

 A translator sometimes has only a limited amount of time per week to
@@ -564,7 +564,7 @@ of messages.
 
 

 

-
+
 Here a more details.  The GNU libintl library (but not the
 corresponding functions in GNU libc) supports an environment variable
 GETTEXT_LOG_UNTRANSLATED.  The GNU libintl library will
@@ -649,7 +649,7 @@ $ package=/usr/src/gnu/coreutils-4.5.4   # the package where it comes from
 

 She takes the latest copy of ‘$lang.po’ from the Translation Project,
 or from the package (in most cases, ‘$package/po/$lang.po’), or
-creates a fresh one if she's the first translator (see section 6  Creating a New PO File).
+creates a fresh one if she's the first translator (see section 6  Creating a New PO File).
 She then uses the following commands to mark the not urgent messages as
 "obsolete".  (This doesn't mean that these messages - translated and
 untranslated ones - will go away.  It simply means that the PO file editor
@@ -666,7 +666,7 @@ $ msgattrib --set-obsolete --ignore-file $domain-missing.po $domain.$lang.po \
 
 

 The she translates ‘$domain.$lang-urgent.po’ by use of a PO file editor
-(see section 8  Editing PO Files).
+(see section 8  Editing PO Files).
 (FIXME: I don't know whether KBabel and gtranslator also
 preserve obsolete messages, as they should.)
 Finally she restores the not urgent messages (with their earlier
diff --git a/gettext-tools/doc/gettext_13.html b/gettext-tools/doc/gettext_13.html
index fd29fa78c..119db60c0 100644
--- a/gettext-tools/doc/gettext_13.html
+++ b/gettext-tools/doc/gettext_13.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - 13  The Maintainer's View
@@ -11,9 +11,9 @@ Go to the first, previous
 

 
 
-
13  The Maintainer's View

+
13  The Maintainer's View

 

-
+
 
 

 

@@ -32,7 +32,7 @@ standards, or even better, Gnits standards, because GNU gettext
 is purposely for helping the internationalization of the whole GNU
 project, and as many other good free packages as possible.  So, the
 maintainer's view presented here presumes that the package already has
-a ‘configure.in’ file and uses GNU Autoconf.
+a ‘configure.ac’ file and uses GNU Autoconf.
 
 

 

@@ -53,7 +53,7 @@ for changes.
 
 
 
-
13.1  Flat or Non-Flat Directory Structures

+
13.1  Flat or Non-Flat Directory Structures

 
 

 Some free software packages are distributed as tar files which unpack
@@ -86,11 +86,11 @@ use this as an opportunity to unflatten their package structure.
 

 
 
-
13.2  Prerequisite Works

+
13.2  Prerequisite Works

 

-
-
-
+
+
+
 
 

 

@@ -129,8 +129,8 @@ want to see the translation of shell script messages.
 
 
  • 
 
-Your package should use Autoconf and have a ‘configure.in’ or
-‘configure.ac’ file.
+Your package should use Autoconf and have a ‘configure.ac’ or
+‘configure.in’ file.
 If it does not, you have to learn how.  The Autoconf documentation
 is quite well written, it is a good idea that you print it and get
 familiar with it.
@@ -138,7 +138,7 @@ familiar with it.
 
  • 
 
 Your C sources should have already been modified according to
-instructions given earlier in this manual.  See section 4  Preparing Program Sources.
+instructions given earlier in this manual.  See section 4  Preparing Program Sources.
 
 
  • 
 
@@ -157,7 +157,7 @@ It is worth adding here a few words about how the maintainer should
 ideally behave with PO files submissions.  As a maintainer, your role is
 to authenticate the origin of the submission as being the representative
 of the appropriate translating teams of the Translation Project (forward
-the submission to ‘translation@iro.umontreal.ca’ in case of doubt),
+the submission to ‘coordinator@translationproject.org’ in case of doubt),
 to ensure that the PO file format is not severely broken and does not
 prevent successful installation, and for the rest, to merely put these
 PO files in ‘po/’ for distribution.
@@ -187,7 +187,7 @@ never try to solve a team's problem on your own.
 
    
 
 
-
    13.3  Invoking the gettextize Program
    
+
    13.3  Invoking the gettextize Program
    
 
 
    
 The gettextize program is an interactive tool that helps the
@@ -222,7 +222,7 @@ GNU gettext.
 
 
  • It performs as many of the tasks mentioned in the next section
 
-section 13.4  Files You Must Create or Alter as can be performed automatically.
+section 13.4  Files You Must Create or Alter as can be performed automatically.
 
 
  • It removes obsolete files and idioms used for previous GNU
 
@@ -239,8 +239,8 @@ It can be invoked as follows:
 
 
    
 
    
-
-
+
+
 
 
     gettextize [ option... ] [ directory ]
@@ -256,30 +256,38 @@ and accepts the following options:
 
    
 
    ‘--force’
 
    
-
-
+
+
 Force replacement of files which already exist.
 
 
    ‘--intl’
 
    
-
+
 Install the libintl sources in a subdirectory named ‘intl/’.
 This libintl will be used to provide internationalization on systems
 that don't have GNU libintl installed.  If this option is omitted,
-the call to AM_GNU_GETTEXT in ‘configure.in’ should read:
+the call to AM_GNU_GETTEXT in ‘configure.ac’ should read:
 ‘AM_GNU_GETTEXT([external])’, and internationalization will not
 be enabled on systems lacking GNU gettext.
 
+
    ‘--po-dir=dir’
+
    
+
+Specify a directory containing PO files.  Such a directory contains the
+translations into various languages of a particular POT file.  This
+option can be specified multiple times, once for each translation domain.
+If it is not specified, the directory named ‘po/’ is updated.
+
 
    ‘--no-changelog’
 
    
-
+
 Don't update or create ChangeLog files.  By default, gettextize
 logs all changes (file additions, modifications and removals) in a
 file called ‘ChangeLog’ in each affected directory.
 
 
    ‘--symlink’
 
    
-
+
 Make symbolic links instead of copying the needed files.  This can be
 useful to save a few kilobytes of disk space, but it requires extra
 effort to create self-contained tarballs, it may disturb some mechanism
@@ -290,20 +298,20 @@ bugs when a newer version of gettext is installed on the system.
 
    
 
    ‘--dry-run’
 
    
-
-
+
+
 Print modifications but don't perform them.  All actions that
 gettextize would normally execute are inhibited and instead only
 listed on standard output.
 
 
    ‘--help’
 
    
-
+
 Display this help and exit.
 
 
    ‘--version’
 
    
-
+
 Output version information and exit.
 
 
    • 
@@ -344,6 +352,9 @@ files.  If the ‘po/’ directory already exists, it will be p
 along with the files it contains, and only ‘Makefile.in.in’ and
 the auxiliary files will be overwritten.
 
+If ‘--po-dir’ has been specified, this holds for every directory
+specified through ‘--po-dir’, instead of ‘po/’.
+
 
  • 
 
 Only if ‘--intl’ has been specified:
@@ -378,8 +389,8 @@ goal of your main ‘Makefile.in’.
 
    
 
    
 Furthermore, gettextize will update all ‘Makefile.am’ files
-in each affected directory, as well as the top level ‘configure.in’
-or ‘configure.ac’ file.
+in each affected directory, as well as the top level ‘configure.ac’
+or ‘configure.in’ file.
 
 
    
 
    
@@ -406,14 +417,14 @@ It is important to understand that gettextize can not do the
 entire job of adapting a package for using GNU gettext.  The
 amount of remaining work depends on whether the package uses GNU
 automake or not.  But in any case, the maintainer should still
-read the section section 13.4  Files You Must Create or Alter after invoking gettextize.
+read the section section 13.4  Files You Must Create or Alter after invoking gettextize.
 
 
    
 
    
 In particular, if after using ‘gettexize’, you get an error
 ‘AC_COMPILE_IFELSE was called before AC_GNU_SOURCE’ or
 ‘AC_RUN_IFELSE was called before AC_GNU_SOURCE’, you can fix it
-by modifying ‘configure.ac’, as described in section 13.4.5  ‘configure.in’ at top level.
+by modifying ‘configure.ac’, as described in section 13.4.5  ‘configure.ac’ at top level.
 
 
    
 
    
@@ -421,14 +432,14 @@ It is also important to understand that gettextize is not part
 of the GNU build system, in the sense that it should not be invoked
 automatically, and not be invoked by someone who doesn't assume the
 responsibilities of a package maintainer.  For the latter purpose, a
-separate tool is provided, see section 13.6.3  Invoking the autopoint Program.
+separate tool is provided, see section 13.6.3  Invoking the autopoint Program.
 
 
    
 
 
-
    13.4  Files You Must Create or Alter
    
+
    13.4  Files You Must Create or Alter
    
 
    
-
+
 
 
    
 
    
@@ -443,7 +454,7 @@ changes needed in each.
 
    
 So, here comes a list of files, each one followed by a description of
 all alterations it needs.  Many examples are taken out from the GNU
-gettext 0.16 distribution itself, or from the GNU
+gettext 0.17 distribution itself, or from the GNU
 hello distribution (http://www.franken.de/users/gnu/ke/hello
 or http://www.gnu.franken.de/ke/hello/)  You may indeed
 refer to the source code of the GNU gettext and GNU hello
@@ -454,9 +465,9 @@ gettext functionality.
 
 
 
-
    13.4.1  ‘POTFILES.in’ in ‘po/’
    
+
    13.4.1  ‘POTFILES.in’ in ‘po/’
    
 
    
-
+
 
 
    
 
    
@@ -485,7 +496,7 @@ src/xgettext.c
 
    
 Hash-marked comments and white lines are ignored.  All other lines
 list those source files containing strings marked for translation
-(see section 4.4  How Marks Appear in Sources), in a notation relative to the top level
+(see section 4.4  How Marks Appear in Sources), in a notation relative to the top level
 of your whole distribution, rather than the location of the
 ‘POTFILES.in’ file itself.
 
@@ -500,9 +511,9 @@ case of bison), not the generated C file.
 
    
 
 
-
    13.4.2  ‘LINGUAS’ in ‘po/’
    
+
    13.4.2  ‘LINGUAS’ in ‘po/’
    
 
    
-
+
 
 
    
 
    
@@ -524,7 +535,7 @@ that these languages are currently supported by your package.  If you
 want to further restrict, at installation time, the set of installed
 languages, this should not be done by modifying the ‘LINGUAS’ file,
 but rather by using the LINGUAS environment variable
-(see section 14  The Installer's and Distributor's View).
+(see section 14  The Installer's and Distributor's View).
 
 
    
 
    
@@ -549,9 +560,9 @@ directory; they are also installed by running gettextize.
 
    
 
 
-
    13.4.3  ‘Makevars’ in ‘po/’
    
+
    13.4.3  ‘Makevars’ in ‘po/’
    
 
    
-
+
 
 
    
 
    
@@ -569,12 +580,18 @@ Only packages which have multiple ‘po/’ directories at diff
 locations need to adjust the three first variables defined in
 ‘Makevars’.
 
+
    
+
    
+As an alternative to the XGETTEXT_OPTIONS variables, it is also
+possible to specify xgettext options through the
+AM_XGETTEXT_OPTION autoconf macro.  See section 13.5.6  AM_XGETTEXT_OPTION in ‘po.m4’.
+
 
    
 
 
-
    13.4.4  Extending ‘Makefile’ in ‘po/’
    
+
    13.4.4  Extending ‘Makefile’ in ‘po/’
    
 
    
-
+
 
 
    
 
    
@@ -585,8 +602,8 @@ with ‘po/Makefile.in.in’.
 
 
    
 
    
-
-
+
+
 GNU gettext comes with a ‘Rules-quot’ file, containing rules for
 building catalogs ‘en@quot.po’ and ‘en@boldquot.po’.  The
 effect of ‘en@quot.po’ is that people who set their LANGUAGE
@@ -606,15 +623,15 @@ GUI programs.  To enable it, similarly add en@boldquot to the
 Similarly, you can create rules for building message catalogs for the
 ‘sr@latin’ locale -- Serbian written with the Latin alphabet --
 from those for the ‘sr’ locale -- Serbian written with Cyrillic
-letters.  See section 9.4  Invoking the msgfilter Program.
+letters.  See section 9.4  Invoking the msgfilter Program.
 
 
    
 
 
-
    13.4.5  ‘configure.in’ at top level
    
+
    13.4.5  ‘configure.ac’ at top level
    
 
 
    
-‘configure.in’ or ‘configure.ac’ - this is the source from which
+‘configure.ac’ or ‘configure.in’ - this is the source from which
 autoconf generates the ‘configure’ script.
 
 
    
@@ -622,14 +639,14 @@ letters.  See section 9.4  Invoking the msg
 
      
 
    1. Declare the package and version.
 
-
+
 
 This is done by a set of lines like these:
 
 
 
       PACKAGE=gettext
-VERSION=0.16
+VERSION=0.17
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -640,18 +657,18 @@ or, if you are using GNU automake, by a line like this:
 
 
 
      -AM_INIT_AUTOMAKE(gettext, 0.16)
+AM_INIT_AUTOMAKE(gettext, 0.17)
 
      
 
 Of course, you replace ‘gettext’ with the name of your package,
-and ‘0.16’ by its version numbers, exactly as they
+and ‘0.17’ by its version numbers, exactly as they
 should appear in the packaged tar file name of your distribution
-(‘gettext-0.16.tar.gz’, here).
+(‘gettext-0.17.tar.gz’, here).
 
 
    2. Check for internationalization support.
 
 Here is the main m4 macro for triggering internationalization
-support.  Just add this line to ‘configure.in’:
+support.  Just add this line to ‘configure.ac’:
 
 
 
      @@ -671,7 +688,7 @@ AM_GNU_GETTEXT([external])
 
 
    3. Have output files created.
 
-The AC_OUTPUT directive, at the end of your ‘configure.in’
+The AC_OUTPUT directive, at the end of your ‘configure.ac’
 file, needs to be modified in two ways:
 
 
@@ -719,7 +736,7 @@ by GNU autoconf.
 
      
 
 
-
      13.4.6  ‘config.guess’, ‘config.sub’ at top level
      
+
      13.4.6  ‘config.guess’, ‘config.sub’ at top level
      
 
 
      
 If you haven't suppressed the ‘intl/’ subdirectory,
@@ -750,7 +767,7 @@ top level of a distribution.  But it is also possible to put them in a
 subdirectory, altogether with other configuration support files like
 ‘install-sh’, ‘ltconfig’, ‘ltmain.sh’ or ‘missing’.
 All you need to do, other than moving the files, is to add the following line
-to your ‘configure.in’.
+to your ‘configure.ac’.
 
 
      
 
@@ -760,9 +777,9 @@ AC_CONFIG_AUX_DIR([subdir])
 
 
 
-
      13.4.7  ‘mkinstalldirs’ at top level
      
+
      13.4.7  ‘mkinstalldirs’ at top level
      
 
      
-
+
 
 
      
 
      
@@ -774,22 +791,22 @@ automake 1.9.
 
      
 
 
-
      13.4.8  ‘aclocal.m4’ at top level
      
+
      13.4.8  ‘aclocal.m4’ at top level
      
 
      
-
+
 
 
      
 
      
 If you do not have an ‘aclocal.m4’ file in your distribution,
 the simplest is to concatenate the files ‘codeset.m4’,
 ‘gettext.m4’, ‘glibc2.m4’, ‘glibc21.m4’, ‘iconv.m4’,
-‘intdiv0.m4’, ‘intl.m4’, ‘intldir.m4’, ‘intmax.m4’,
-‘inttypes_h.m4’, ‘inttypes-pri.m4’, ‘lcmessage.m4’,
-‘lib-ld.m4’, ‘lib-link.m4’, ‘lib-prefix.m4’, ‘lock.m4’,
-‘longdouble.m4’, ‘longlong.m4’, ‘nls.m4’, ‘po.m4’,
-‘printf-posix.m4’, ‘progtest.m4’, ‘size_max.m4’,
-‘stdint_h.m4’, ‘uintmax_t.m4’, ‘ulonglong.m4’,
-‘visibility.m4’, ‘wchar_t.m4’, ‘wint_t.m4’, ‘xsize.m4’
+‘intdiv0.m4’, ‘intl.m4’, ‘intldir.m4’, ‘intlmacosx.m4’,
+‘intmax.m4’, ‘inttypes_h.m4’, ‘inttypes-pri.m4’,
+‘lcmessage.m4’, ‘lib-ld.m4’, ‘lib-link.m4’,
+‘lib-prefix.m4’, ‘lock.m4’, ‘longlong.m4’, ‘nls.m4’,
+‘po.m4’, ‘printf-posix.m4’, ‘progtest.m4’, ‘size_max.m4’,
+‘stdint_h.m4’, ‘uintmax_t.m4’, ‘visibility.m4’,
+‘wchar_t.m4’, ‘wint_t.m4’, ‘xsize.m4’
 from GNU gettext's
 ‘m4/’ directory into a single file.  If you have suppressed the
 ‘intl/’ directory, only ‘gettext.m4’, ‘iconv.m4’,
@@ -838,9 +855,9 @@ piece of m4 code will be the same for all projects using GNU
 
      
 
 
-
      13.4.9  ‘acconfig.h’ at top level
      
+
      13.4.9  ‘acconfig.h’ at top level
      
 
      
-
+
 
 
      
 
      
@@ -854,9 +871,9 @@ independently from the ‘intl/’ directory.
 
      
 
 
-
      13.4.10  ‘config.h.in’ at top level
      
+
      13.4.10  ‘config.h.in’ at top level
      
 
      
-
+
 
 
      
 
      
@@ -903,7 +920,7 @@ following lines to ‘config.h.in’:
 
 
 
-
      13.4.11  ‘Makefile.in’ at top level
      
+
      13.4.11  ‘Makefile.in’ at top level
      
 
 
      
 Here are a few modifications you need to make to your main, top-level
@@ -990,7 +1007,7 @@ to ‘Makefile.am’ are already made by running ‘g
 
      
 
 
-
      13.4.12  ‘Makefile.in’ in ‘src/’
      
+
      13.4.12  ‘Makefile.in’ in ‘src/’
      
 
 
      
 Some of the modifications made in the main ‘Makefile.in’ will
@@ -1038,7 +1055,7 @@ subdir = src
 
    4. 
 
 The main function of your program will normally call
-bindtextdomain (see see section 4.2  Triggering gettext Operations), like this:
+bindtextdomain (see see section 4.2  Triggering gettext Operations), like this:
 
 
 
      @@ -1181,11 +1198,11 @@ AM_CPPFLAGS = -I../intl -I$(top_srcdir)/intl
 
 
 
-
      13.4.13  ‘gettext.h’ in ‘lib/’
      
+
      13.4.13  ‘gettext.h’ in ‘lib/’
      
 
      
-
-
-
+
+
+
 
 
      
 
      
@@ -1222,7 +1239,7 @@ to 0 in C preprocessor expressions.
 
 
      
 
      
-
+
 ‘gettext.h’ is a convenience header file for conditional use of
 ‘<libintl.h>’, depending on the ENABLE_NLS macro.  If
 ENABLE_NLS is set, it includes ‘<libintl.h>’; otherwise it
@@ -1261,14 +1278,14 @@ package that needs it should contain a copy of it on its own.
 
      
 
 
-
      13.5  Autoconf macros for use in ‘configure.in’
      
+
      13.5  Autoconf macros for use in ‘configure.ac’
      
 
      
-
+
 
 
      
 
      
 GNU gettext installs macros for use in a package's
-‘configure.in’ or ‘configure.ac’.
+‘configure.ac’ or ‘configure.in’.
 See section ‘Introduction’ in The Autoconf Manual.
 The primary macro is, of course, AM_GNU_GETTEXT.
 
@@ -1276,10 +1293,10 @@ The primary macro is, of course, AM_GNU_GETTEXT.
 
 
 
-
      13.5.1  AM_GNU_GETTEXT in ‘gettext.m4’
      
+
      13.5.1  AM_GNU_GETTEXT in ‘gettext.m4’
      
 
 
      
-
+
 The AM_GNU_GETTEXT macro tests for the presence of the GNU gettext
 function family in either the C library or a separate libintl
 library (shared or static libraries are both supported) or in the package's
@@ -1349,7 +1366,7 @@ The complexities that AM_GNU_GETTEXT deals with are the following:
 
        
 
      • 
 
-
+
 Some operating systems have gettext in the C library, for example
 glibc.  Some have it in a separate library libintl.  GNU libintl
 might have been installed as part of the GNU gettext package.
@@ -1385,26 +1402,25 @@ and LTLIBINTL variables.
 
 
 
-
        13.5.2  AM_GNU_GETTEXT_VERSION in ‘gettext.m4’
        
+
        13.5.2  AM_GNU_GETTEXT_VERSION in ‘gettext.m4’
        
 
 
        
-
+
 The AM_GNU_GETTEXT_VERSION macro declares the version number of
 the GNU gettext infrastructure that is used by the package.
 
 
        
 
        
 The use of this macro is optional; only the autopoint program makes
-use of it (see section 13.6  Integrating with CVS).
+use of it (see section 13.6  Integrating with CVS).
 
 
        
 
 
-
-
        13.5.3  AM_GNU_GETTEXT_NEED in ‘gettext.m4’
        
+
        13.5.3  AM_GNU_GETTEXT_NEED in ‘gettext.m4’
        
 
 
        
-
+
 The AM_GNU_GETTEXT_NEED macro declares a constraint regarding the
 GNU gettext implementation.  The syntax is
 
@@ -1434,10 +1450,10 @@ the AM_GNU_GETTEXT invocation; the order doesn't matter.
 
        
 
 
-
        13.5.4  AM_GNU_GETTEXT_INTL_SUBDIR in ‘intldir.m4’
        
+
        13.5.4  AM_GNU_GETTEXT_INTL_SUBDIR in ‘intldir.m4’
        
 
 
        
-
+
 The AM_GNU_GETTEXT_INTL_SUBDIR macro specifies that the
 AM_GNU_GETTEXT macro, although invoked with the first argument
 ‘external’, should also prepare for building the ‘intl/’
@@ -1456,14 +1472,14 @@ GNU autoconf 2.61 or newer.
 
        
 
 
-
        13.5.5  AM_PO_SUBDIRS in ‘po.m4’
        
+
        13.5.5  AM_PO_SUBDIRS in ‘po.m4’
        
 
 
        
-
+
 The AM_PO_SUBDIRS macro prepares the ‘po/’ directories of the
 package for building.  This macro should be used in internationalized
 programs written in other programming languages than C, C++, Objective C,
-for example sh, Python, Lisp.  See section 15  Other Programming Languages for a list of programming languages that support localization
+for example sh, Python, Lisp.  See section 15  Other Programming Languages for a list of programming languages that support localization
 through PO files.
 
 
        
@@ -1476,10 +1492,44 @@ variables in each ‘po/’ directory.
 
        
 
 
-
        13.5.6  AM_ICONV in ‘iconv.m4’
        
+
        13.5.6  AM_XGETTEXT_OPTION in ‘po.m4’
        
 
 
        
-
+
+The AM_XGETTEXT_OPTION macro registers a command-line option to be
+used in the invocations of xgettext in the ‘po/’ directories
+of the package.
+
+
        
+
        
+For example, if you have a source file that defines a function
+‘error_at_line’ whose fifth argument is a format string, you can use
+
+
        +AM_XGETTEXT_OPTION([--flag=error_at_line:5:c-format])
+
        
+
+
        
+to instruct xgettext to mark all translatable strings in ‘gettext’
+invocations that occur as fifth argument to this function as ‘c-format’.
+
+
        
+
        
+See section 5.1  Invoking the xgettext Program for the list of options that xgettext
+accepts.
+
+
        
+
        
+The use of this macro is an alternative to the use of the
+‘XGETTEXT_OPTIONS’ variable in ‘po/Makevars’.
+
+
        
+
+
+
        13.5.7  AM_ICONV in ‘iconv.m4’
        
+
+
        
+
 The AM_ICONV macro tests for the presence of the POSIX/XSI
 iconv function family in either the C library or a separate
 libiconv library.  If found, it sets the am_cv_func_iconv
@@ -1503,7 +1553,7 @@ The complexities that AM_ICONV deals with are the following:
 
        
 
 
 
-
        15.5.2.3  Invoking the gettext program
        
+
        15.5.2.3  Invoking the gettext program
        
 
 
        
-
-
+
+
 
 
         gettext [option] [[textdomain] msgid]
@@ -843,7 +854,7 @@ gettext [option] -s [msgid]...
 
        
 
 
        
-
+
 The gettext program displays the native language translation of a
 textual message.
 
@@ -858,14 +869,14 @@ textual message.
 
        
 
        ‘--domain=textdomain’
 
        
-
-
+
+
 Retrieve translated messages from textdomain.  Usually a textdomain
 corresponds to a package, a program, or a module of a program.
 
 
        ‘-e’
 
        
-
+
 Enable expansion of some escape sequences.  This option is for compatibility
 with the ‘echo’ program or shell built-in.  The escape sequences
 ‘\a’, ‘\b’, ‘\c’, ‘\f’, ‘\n’, ‘\r’, ‘\t’,
@@ -874,7 +885,7 @@ interpreted like the System V ‘echo’ program did.
 
 
        ‘-E’
 
        
-
+
 This option is only for compatibility with the ‘echo’ program or shell
 built-in.  It has no effect.
 
@@ -882,13 +893,13 @@ built-in.  It has no effect.
 
        
 
        ‘--help’
 
        
-
-
+
+
 Display this help and exit.
 
 
        ‘-n’
 
        
-
+
 Suppress trailing newline.  By default, gettext adds a newline to
 the output.
 
@@ -896,8 +907,8 @@ the output.
 
        
 
        ‘--version’
 
        
-
-
+
+
 Output version information and exit.
 
 
        ‘[textdomain] msgid’
@@ -921,18 +932,18 @@ messages found in the selected catalog are translated.
 
        
 
 
-
        15.5.2.4  Invoking the ngettext program
        
+
        15.5.2.4  Invoking the ngettext program
        
 
 
        
-
-
+
+
 
 
         ngettext [option] [textdomain] msgid msgid-plural count
 
        
 
 
        
-
+
 The ngettext program displays the native language translation of a
 textual message whose grammatical form depends on a number.
 
@@ -947,14 +958,14 @@ textual message whose grammatical form depends on a number.
 
        
 
        ‘--domain=textdomain’
 
        
-
-
+
+
 Retrieve translated messages from textdomain.  Usually a textdomain
 corresponds to a package, a program, or a module of a program.
 
 
        ‘-e’
 
        
-
+
 Enable expansion of some escape sequences.  This option is for compatibility
 with the ‘gettext’ program.  The escape sequences
 ‘\a’, ‘\b’, ‘\c’, ‘\f’, ‘\n’, ‘\r’, ‘\t’,
@@ -963,7 +974,7 @@ interpreted like the System V ‘echo’ program did.
 
 
        ‘-E’
 
        
-
+
 This option is only for compatibility with the ‘gettext’ program.  It has
 no effect.
 
@@ -971,16 +982,16 @@ no effect.
 
        
 
        ‘--help’
 
        
-
-
+
+
 Display this help and exit.
 
 
        ‘-V’
 
        
 
        ‘--version’
 
        
-
-
+
+
 Output version information and exit.
 
 
        ‘textdomain’
@@ -1006,20 +1017,20 @@ environment variable TEXTDOMAINDIR.
 
        
 
 
-
        15.5.2.5  Invoking the envsubst program
        
+
        15.5.2.5  Invoking the envsubst program
        
 
 
        
-
-
+
+
 
 
         envsubst [option] [shell-format]
 
        
 
 
        
-
-
-
+
+
+
 The envsubst program substitutes the values of environment variables.
 
 
        
@@ -1033,8 +1044,8 @@ The envsubst program substitutes the values of environment variable
 
        
 
        ‘--variables’
 
        
-
-
+
+
 Output the variables occurring in shell-format.
 
 
    • 
@@ -1049,16 +1060,16 @@ Output the variables occurring in shell-format.
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
@@ -1088,17 +1099,17 @@ consists of the environment variables that are referenced in
 
    
 
 
-
    15.5.2.6  Invoking the eval_gettext function
    
+
    15.5.2.6  Invoking the eval_gettext function
    
 
 
    
-
+
 
 
     eval_gettext msgid
 
    
 
 
    
-
+
 This function outputs the native language translation of a textual message,
 performing dollar-substitution on the result.  Note that only shell variables
 mentioned in msgid will be dollar-substituted in the result.
@@ -1106,17 +1117,17 @@ mentioned in msgid will be dollar-substituted in the result.
 
    
 
 
-
    15.5.2.7  Invoking the eval_ngettext function
    
+
    15.5.2.7  Invoking the eval_ngettext function
    
 
 
    
-
+
 
 
     eval_ngettext msgid msgid-plural count
 
    
 
 
    
-
+
 This function outputs the native language translation of a textual message
 whose grammatical form depends on a number, performing dollar-substitution
 on the result.  Note that only shell variables mentioned in msgid or
@@ -1125,9 +1136,9 @@ on the result.  Note that only shell variables mentioned in msgid or
 
    
 
 
-
    15.5.3  bash - Bourne-Again Shell Script
    
+
    15.5.3  bash - Bourne-Again Shell Script
    
 
    
-
+
 
 
    
 
    
@@ -1176,9 +1187,9 @@ that don't have the gettext() function in libc.
 
    
 
 
-
    15.5.4  Python
    
+
    15.5.4  Python
    
 
    
-
+
 
 
    
 
    
@@ -1253,11 +1264,11 @@ An example is available in the ‘examples’ directory: 
 
    
 
 
-
    15.5.5  GNU clisp - Common Lisp
    
+
    15.5.5  GNU clisp - Common Lisp
    
 
    
-
-
-
+
+
+
 
 
    
 
    
@@ -1325,9 +1336,9 @@ An example is available in the ‘examples’ directory: 
 
    
 
 
-
    15.5.6  GNU clisp C sources
    
+
    15.5.6  GNU clisp C sources
    
 
    
-
+
 
 
    
 
    
@@ -1393,9 +1404,9 @@ On platforms without gettext, no translation.
 
 
 
-
    15.5.7  Emacs Lisp
    
+
    15.5.7  Emacs Lisp
    
 
    
-
+
 
 
    
 
    
@@ -1459,9 +1470,9 @@ Only XEmacs.  Without I18N3 defined at build time, no translation.
 
 
 
-
    15.5.8  librep
    
+
    15.5.8  librep
    
 
    
-
+
 
 
    
 
    
@@ -1529,10 +1540,10 @@ An example is available in the ‘examples’ directory: 
 
    
 
 
-
    15.5.9  GNU guile - Scheme
    
+
    15.5.9  GNU guile - Scheme
    
 
    
-
-
+
+
 
 
    
 
    
@@ -1600,9 +1611,9 @@ An example is available in the ‘examples’ directory: 
 
    
 
 
-
    15.5.10  GNU Smalltalk
    
+
    15.5.10  GNU Smalltalk
    
 
    
-
+
 
 
    
 
    
@@ -1673,9 +1684,9 @@ An example is available in the ‘examples’ directory:
 
    
 
 
-
    15.5.11  Java
    
+
    15.5.11  Java
    
 
    
-
+
 
 
    
 
    
@@ -1698,7 +1709,8 @@ _("abc")
 
 
    gettext/ngettext functions
 
    
-GettextResource.gettext, GettextResource.ngettext
+GettextResource.gettext, GettextResource.ngettext,
+GettextResource.pgettext, GettextResource.npgettext
 
 
    textdomain
 
    
@@ -1798,25 +1810,25 @@ a PO file with plural handling.
 
 The gnu.gettext.GettextResource API.
 
-Reference documentation in Javadoc 1.1 style format
-is in the javadoc1 directory and
-in Javadoc 2 style format
-in the javadoc2 directory.
+Reference documentation in Javadoc 1.1 style format is in the
+javadoc2 directory.
 
 Its gettext function returns a string translation.  Note that when
 a translation is missing, the msgid argument is returned unchanged.
 
 This has the advantage of having the ngettext function for plural
-handling.
+handling and the pgettext and npgettext for strings constraint
+to a particular context.
 
-
+
 To use this API, one needs the libintl.jar file which is part of
 the GNU gettext package and distributed under the LGPL.
 
 
 
    
-Three examples, using the second API, are available in the ‘examples’
-directory: hello-java, hello-java-awt, hello-java-swing.
+Four examples, using the second API, are available in the ‘examples’
+directory: hello-java, hello-java-awt, hello-java-swing,
+hello-java-qtjambi.
 
 
    
 
    
@@ -1915,9 +1927,9 @@ than a class with a single-letter name.
 
    
 
 
-
    15.5.12  C#
    
+
    15.5.12  C#
    
 
    
-
+
 
 
    
 
    
@@ -1942,6 +1954,8 @@ _("abc")
 
    
 GettextResourceManager.GetString,
 GettextResourceManager.GetPluralString
+GettextResourceManager.GetParticularString
+GettextResourceManager.GetParticularPluralString
 
 
    textdomain
 
    
@@ -2072,6 +2086,13 @@ only contain data and only support lookups that depend on a single string.
 
 
  • 
 
+Context handling: A message catalog in .dll format supports the
+query-with-context functions GetParticularString and
+GetParticularPluralString.  Whereas .resources files can
+only contain data and only support lookups that depend on a single string.
+
+
  • 
+
 The GettextResourceManager that loads the message catalogs in
 .dll format also provides for inheritance on a per-message basis.
 For example, in Austrian (de_AT) locale, translations from the German
@@ -2138,7 +2159,16 @@ a translation is missing, the msgid argument is returned unchanged.
 The GetPluralString function returns a string translation with plural
 handling, like the ngettext function in C.
 
-
+The GetParticularString function returns a string's translation,
+specific to a particular context, like the pgettext function in C.
+Note that when a translation is missing, the msgid argument is returned
+unchanged.
+
+The GetParticularPluralString function returns a string translation,
+specific to a particular context, with plural handling, like the
+npgettext function in C.
+
+
 To use this API, one needs the GNU.Gettext.dll file which is part of
 the GNU gettext package and distributed under the LGPL.
 
@@ -2223,10 +2253,10 @@ with a single-letter name.
 
    
 
 
-
    15.5.13  GNU awk
    
+
    15.5.13  GNU awk
    
 
    
-
-
+
+
 
 
    
 
    
@@ -2296,11 +2326,11 @@ An example is available in the ‘examples’ directory: 
 
    
 
 
-
    15.5.14  Pascal - Free Pascal Compiler
    
+
    15.5.14  Pascal - Free Pascal Compiler
    
 
    
-
-
-
+
+
+
 
 
    
 
    
@@ -2377,9 +2407,9 @@ An example is available in the ‘examples’ directory: 
 
    
 
 
-
    15.5.15  wxWidgets library
    
+
    15.5.15  wxWidgets library
    
 
    
-
+
 
 
    
 
    
@@ -2445,10 +2475,10 @@ yes
 
 
 
-
    15.5.16  YCP - YaST2 scripting language
    
+
    15.5.16  YCP - YaST2 scripting language
    
 
    
-
-
+
+
 
 
    
 
    
@@ -2516,10 +2546,10 @@ An example is available in the ‘examples’ directory: 
 
    
 
 
-
    15.5.17  Tcl - Tk's scripting language
    
+
    15.5.17  Tcl - Tk's scripting language
    
 
    
-
-
+
+
 
 
    
 
    
@@ -2602,9 +2632,9 @@ argument is given.
 
    
 
 
-
    15.5.18  Perl
    
+
    15.5.18  Perl
    
 
    
-
+
 
 
    
 
    
@@ -2717,7 +2747,7 @@ An example is available in the ‘examples’ directory: 
 
 
    
 
    
-
+
 
 
    
 
    
@@ -2732,7 +2762,7 @@ worst probably being its imperfectness.
 
 
 
-
    15.5.18.1  General Problems Parsing Perl Code
    
+
    15.5.18.1  General Problems Parsing Perl Code
    
 
 
    
 It is often heard that only Perl can parse Perl.  This is not true.
@@ -2866,9 +2896,9 @@ reformulate your code in a manner less challenging to xgettext.
 
    
 
 
-
    15.5.18.2  Which keywords will xgettext look for?
    
+
    15.5.18.2  Which keywords will xgettext look for?
    
 
    
-
+
 
 
    
 
    
@@ -2915,9 +2945,9 @@ The keys of lookups into the hash reference $gettext will be extrac
 
 
 
-
    15.5.18.3  How to Extract Hash Keys
    
+
    15.5.18.3  How to Extract Hash Keys
    
 
    
-
+
 
 
    
 
    
@@ -2970,9 +3000,9 @@ are not allowed, regardless of the use utf8 pragma.
 
    
 
 
-
    15.5.18.4  What are Strings And Quote-like Expressions?
    
+
    15.5.18.4  What are Strings And Quote-like Expressions?
    
 
    
-
+
 
 
    
 
    
@@ -3070,9 +3100,9 @@ Delimiters that start with a digit are not supported!
 
 
 
-
    15.5.18.5  Invalid Uses Of String Interpolation
    
+
    15.5.18.5  Invalid Uses Of String Interpolation
    
 
    
-
+
 
 
    
 
    
@@ -3208,9 +3238,9 @@ well write what you mean.
 
    
 
 
-
    15.5.18.6  Valid Uses Of String Interpolation
    
+
    15.5.18.6  Valid Uses Of String Interpolation
    
 
    
-
+
 
 
    
 
    
@@ -3296,9 +3326,9 @@ s/$gettext{"U. S. A."}/$gettext{"U. S. A."} $gettext{"(dial +0)"}/g;
 
 
 
-
    15.5.18.7  When To Use Parentheses
    
+
    15.5.18.7  When To Use Parentheses
    
 
    
-
+
 
 
    
 
    
@@ -3342,9 +3372,9 @@ print dngettext 'package', ("one cake", "several cakes", $n), $discarded;
 
 
 
-
    15.5.18.8  How To Grok with Long Lines
    
+
    15.5.18.8  How To Grok with Long Lines
    
 
    
-
+
 
 
    
 
    
@@ -3416,9 +3446,9 @@ the resulting POT file.
 
    
 
 
-
    15.5.18.9  Bugs, Pitfalls, And Things That Do Not Work
    
+
    15.5.18.9  Bugs, Pitfalls, And Things That Do Not Work
    
 
    
-
+
 
 
    
 
    
@@ -3568,9 +3598,9 @@ get executed.  Most of the time you will happily get along with
 
    
 
 
-
    15.5.19  PHP Hypertext Preprocessor
    
+
    15.5.19  PHP Hypertext Preprocessor
    
 
    
-
+
 
 
    
 
    
@@ -3639,9 +3669,9 @@ An example is available in the ‘examples’ directory: 
 
    
 
 
-
    15.5.20  Pike
    
+
    15.5.20  Pike
    
 
    
-
+
 
 
    
 
    
@@ -3705,9 +3735,9 @@ On platforms without gettext, the functions are not available.
 
 
 
-
    15.5.21  GNU Compiler Collection sources
    
+
    15.5.21  GNU Compiler Collection sources
    
 
    
-
+
 
 
    
 
    
@@ -3772,7 +3802,7 @@ yes
 
 
 
-
    15.6  Internationalizable Data
    
+
    15.6  Internationalizable Data
    
 
 
    
 Here is a list of other data formats which can be internationalized
@@ -3782,7 +3812,7 @@ using GNU gettext.
 
 
 
-
    15.6.1  POT - Portable Object Template
    
+
    15.6.1  POT - Portable Object Template
    
 
 
    
 
@@ -3801,9 +3831,9 @@ gettext
 
 
 
-
    15.6.2  Resource String Table
    
+
    15.6.2  Resource String Table
    
 
    
-
+
 
 
    
 
    
@@ -3823,7 +3853,7 @@ fpk
 
 
 
-
    15.6.3  Glade - GNOME user interface description
    
+
    15.6.3  Glade - GNOME user interface description
    
 
 
    
 
diff --git a/gettext-tools/doc/gettext_16.html b/gettext-tools/doc/gettext_16.html
index 38552087d..2fa5a070c 100644
--- a/gettext-tools/doc/gettext_16.html
+++ b/gettext-tools/doc/gettext_16.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - 16  Concluding Remarks
@@ -11,7 +11,7 @@ Go to the first, previous
 
    
 
 
-
    16  Concluding Remarks
    
+
    16  Concluding Remarks
    
 
 
    
 We would like to conclude this GNU gettext manual by presenting
@@ -23,9 +23,9 @@ about Native Language Support matters.
 
 
 
-
    16.1  History of GNU gettext
    
+
    16.1  History of GNU gettext
    
 
    
-
+
 
 
    
 
    
@@ -125,10 +125,10 @@ manipulating PO files.
 
    
 
 
-
    16.2  Related Readings
    
+
    16.2  Related Readings
    
 
    
-
-
+
+
 
 
    
 
    
diff --git a/gettext-tools/doc/gettext_17.html b/gettext-tools/doc/gettext_17.html
index 2fe84d873..09b28d357 100644
--- a/gettext-tools/doc/gettext_17.html
+++ b/gettext-tools/doc/gettext_17.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - A  Language Codes
@@ -11,10 +11,10 @@ Go to the first, previous
 
    
 
 
-
    A  Language Codes
    
+
    A  Language Codes
    
 
    
-
-
+
+
 
 
    
 
    
@@ -27,7 +27,7 @@ come from this standard.
 
 
 
-
    A.1  Usual Language Codes
    
+
    A.1  Usual Language Codes
    
 
 
    
 For the commonly used languages, the ISO 639-1 standard defines two-letter
@@ -598,7 +598,7 @@ Zulu.
 
 
 
-
    A.2  Rare Language Codes
    
+
    A.2  Rare Language Codes
    
 
 
    
 For rarely used languages, the ISO 639-2 standard defines three-letter
diff --git a/gettext-tools/doc/gettext_18.html b/gettext-tools/doc/gettext_18.html
index d1b75c5e2..2bb97dbb8 100644
--- a/gettext-tools/doc/gettext_18.html
+++ b/gettext-tools/doc/gettext_18.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - B  Country Codes
@@ -11,10 +11,10 @@ Go to the first, previous
 
    
 
 
-
    B  Country Codes
    
+
    B  Country Codes
    
 
    
-
-
+
+
 
 
    
 
    
diff --git a/gettext-tools/doc/gettext_19.html b/gettext-tools/doc/gettext_19.html
index 71b9338bf..3734e715a 100644
--- a/gettext-tools/doc/gettext_19.html
+++ b/gettext-tools/doc/gettext_19.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - C  Licenses
@@ -11,9 +11,9 @@ Go to the first, previous
 
    
 
 
-
    C  Licenses
    
+
    C  Licenses
    
 
    
-
+
 
 
    
 
    
@@ -27,13 +27,13 @@ particular file or directory.  Here is a summary:
 
 The libintl and libasprintf libraries are covered by the
 GNU Library General Public License (LGPL).  
-A copy of the license is included in section C.2  GNU LESSER GENERAL PUBLIC LICENSE.
+A copy of the license is included in section C.2  GNU LESSER GENERAL PUBLIC LICENSE.
 
 
  • 
 
 The executable programs of this package and the libgettextpo library
 are covered by the GNU General Public License (GPL).
-A copy of the license is included in section C.1  GNU GENERAL PUBLIC LICENSE.
+A copy of the license is included in section C.1  GNU GENERAL PUBLIC LICENSE.
 
 
  • 
 
@@ -47,21 +47,21 @@ GNU Free Documentation License (FDL), either version 1.2 of the
 License, or (at your option) any later version published by the
 Free Software Foundation (FSF); with no Invariant Sections, with no
 Front-Cover Text, and with no Back-Cover Texts.
-A copy of the license is included in section C.3  GNU Free Documentation License.
+A copy of the license is included in section C.3  GNU Free Documentation License.
 
    
 This manual is covered by the GNU GPL.  You can redistribute it and/or
 modify it under the terms of the GNU General Public License (GPL), either
 version 2 of the License, or (at your option) any later version published
 by the Free Software Foundation (FSF).
-A copy of the license is included in section C.1  GNU GENERAL PUBLIC LICENSE.
+A copy of the license is included in section C.1  GNU GENERAL PUBLIC LICENSE.
 
 
 
 
-
    C.1  GNU GENERAL PUBLIC LICENSE
    
+
    C.1  GNU GENERAL PUBLIC LICENSE
    
 
    
-
-
+
+
 Version 2, June 1991
 
 
    
@@ -77,7 +77,7 @@ of this license document, but changing it is not allowed.
 
 
 
-
    Preamble
    
+
    Preamble
    
 
 
    
   The licenses for most software are designed to take away your
@@ -409,7 +409,7 @@ POSSIBILITY OF SUCH DAMAGES.
 
 
 
-
    Appendix: How to Apply These Terms to Your New Programs
    
+
    Appendix: How to Apply These Terms to Your New Programs
    
 
 
    
   If you develop a new program, and you want it to be of the greatest
@@ -492,10 +492,10 @@ library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 
 
-
    C.2  GNU LESSER GENERAL PUBLIC LICENSE
    
+
    C.2  GNU LESSER GENERAL PUBLIC LICENSE
    
 
    
-
-
+
+
 Version 2.1, February 1999
 
 
    
@@ -514,7 +514,7 @@ version number 2.1.]
 
 
 
-
    Preamble
    
+
    Preamble
    
 
 
    
   The licenses for most software are designed to take away your
@@ -1055,7 +1055,7 @@ DAMAGES.
 
 
 
-
    How to Apply These Terms to Your New Libraries
    
+
    How to Apply These Terms to Your New Libraries
    
 
 
    
   If you develop a new library, and you want it to be of the greatest
@@ -1116,10 +1116,10 @@ Ty Coon, President of Vice
 That's all there is to it!
 
 
-
    C.3  GNU Free Documentation License
    
+
    C.3  GNU Free Documentation License
    
 
    
-
-
+
+
 Version 1.2, November 2002
 
 
    
@@ -1556,7 +1556,7 @@ as a draft) by the Free Software Foundation.
 
 
 
-
    ADDENDUM: How to use this License for your documents
    
+
    ADDENDUM: How to use this License for your documents
    
 
 
    
 To use this License in a document you have written, include a copy of
diff --git a/gettext-tools/doc/gettext_2.html b/gettext-tools/doc/gettext_2.html
index fad6fb637..7159a2428 100644
--- a/gettext-tools/doc/gettext_2.html
+++ b/gettext-tools/doc/gettext_2.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - 2  The User's View
@@ -14,86 +14,333 @@ Go to the first, previous<
 
    2  The User's View
    
 
 
    
-When GNU gettext will truly have reached its goal, average users
-should feel some kind of astonished pleasure, seeing the effect of
-that strange kind of magic that just makes their own native language
-appear everywhere on their screens.  As for naive users, they would
-ideally have no special pleasure about it, merely taking their own
-language for granted, and becoming rather unhappy otherwise.
+Nowadays, when users log into a computer, they usually find that all
+their programs show messages in their native language -- at least for
+users of languages with an active free software community, like French or
+German; to a lesser extent for languages with a smaller participation in
+free software and the GNU project, like Hindi and Filipino.
 
 
    
 
    
-So, let's try to describe here how we would like the magic to operate,
-as we want the users' view to be the simplest, among all ways one
-could look at GNU gettext.  All other software engineers:
-programmers, translators, maintainers, should work together in such a
-way that the magic becomes possible.  This is a long and progressive
-undertaking, and information is available about the progress of the
-Translation Project.
+How does this work?  How can the user influence the language that is used
+by the programs?  This chapter will answer it.
+
+
    
+
+
+
+
    2.1  Operating System Installation
    
+
+
    
+The default language is often already specified during operating system
+installation.  When the operating system is installed, the installer
+typically asks for the language used for the installation process and,
+separately, for the language to use in the installed system.  Some OS
+installers only ask for the language once.
 
 
    
 
    
-When a package is distributed, there are two kinds of users:
-installers who fetch the distribution, unpack it, configure
-it, compile it and install it for themselves or others to use; and
-end users that call programs of the package, once these have
-been installed at their site.  GNU gettext is offering magic
-for both installers and end users.
+This determines the system-wide default language for all users.  But the
+installers often give the possibility to install extra localizations for
+additional languages.  For example, the localizations of KDE (the K
+Desktop Environment) and OpenOffice.org are often bundled separately,
+as one installable package per language.
 
 
    
+
    
+At this point it is good to consider the intended use of the machine: If
+it is a machine designated for personal use, additional localizations are
+probably not necessary.  If, however, the machine is in use in an
+organization or company that has international relationships, one can
+consider the needs of guest users.  If you have a guest from abroad, for
+a week, what could be his preferred locales?  It may be worth installing
+these additional localizations ahead of time, since they cost only a bit
+of disk space at this point.
 
+
    
+
    
+The system-wide default language is the locale configuration that is used
+when a new user account is created.  But the user can have his own locale
+configuration that is different from the one of the other users of the
+same machine.  He can specify it, typically after the first login, as
+described in the next section.
 
+
    
+
+
+
    2.2  Setting the Locale Used by GUI Programs
    
 
-
    2.1  The Current ‘ABOUT-NLS’ Matrix
    
 
    
-
-
-
+The immediately available programs in a user's desktop come from a group
+of programs called a “desktop environment”; it usually includes the window
+manager, a web browser, a text editor, and more.  The most common free
+desktop environments are KDE, GNOME, and Xfce.
+
+
    
+
    
+The locale used by GUI programs of the desktop environment can be specified
+in a configuration screen called “control center”, “language settings”
+or “country settings”.
+
+
    
+
    
+Individual GUI programs that are not part of the desktop environment can
+have their locale specified either in a settings panel, or through environment
+variables.
 
 
    
 
    
-Languages are not equally supported in all packages using GNU
-gettext.  To know if some package uses GNU gettext, one
-may check the distribution for the ‘ABOUT-NLS’ information file, for
-some ‘ll.po’ files, often kept together into some ‘po/’
-directory, or for an ‘intl/’ directory.  Internationalized packages
-have usually many ‘ll.po’ files, where ll represents
-the language.  section 2.2  Magic for End Users for a complete description of the format
-for ll.
+For some programs, it is possible to specify the locale through environment
+variables, possibly even to a different locale than the desktop's locale.
+This means, instead of starting a program through a menu or from the file
+system, you can start it from the command-line, after having set some
+environment variables.  The environment variables can be those specified
+in the next section (section 2.3  Setting the Locale through Environment Variables); for some versions of
+KDE, however, the locale is specified through a variable KDE_LANG,
+rather than LANG or LC_ALL.
 
 
    
+
+
+
    2.3  Setting the Locale through Environment Variables
    
+
 
    
-More generally, a matrix is available for showing the current state
-of the Translation Project, listing which packages are prepared for
-multi-lingual messages, and which languages are supported by each.
-Because this information changes often, this matrix is not kept within
-this GNU gettext manual.  This information is often found in
-file ‘ABOUT-NLS’ from various distributions, but is also as old as
-the distribution itself.  A recent copy of this ‘ABOUT-NLS’ file,
-containing up-to-date information, should generally be found on the
-Translation Project sites, and also on most GNU archive sites.
+As a user, if your language has been installed for this package, in the
+simplest case, you only have to set the LANG environment variable
+to the appropriate ‘ll_CC’ combination.  For example,
+let's suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute 
+‘setenv LANG de_DE’ (in csh),
+‘export LANG; LANG=de_DE’ (in sh) or
+‘export LANG=de_DE’ (in bash).  This can be done from your
+‘.login’ or ‘.profile’ file, once and for all.
 
 
    
 
 
-
    2.2  Magic for End Users
    
+
+
    2.3.1  Locale Names
    
+
 
    
+A locale name usually has the form ‘ll_CC’.  Here
+‘ll’ is an ISO 639 two-letter language code, and
+‘CC’ is an ISO 3166 two-letter country code.  For example,
+for German in Germany, ll is de, and CC is DE.
+You find a list of the language codes in appendix section A  Language Codes and
+a list of the country codes in appendix section B  Country Codes.
+
+
    
+
    
+You might think that the country code specification is redundant.  But in
+fact, some languages have dialects in different countries.  For example,
+‘de_AT’ is used for Austria, and ‘pt_BR’ for Brazil.  The country
+code serves to distinguish the dialects.
+
+
    
+
    
+Many locale names have an extended syntax
+‘ll_CC.encoding’ that also specifies the character
+encoding.  These are in use because between 2000 and 2005, most users have
+switched to locales in UTF-8 encoding.  For example, the German locale on
+glibc systems is nowadays ‘de_DE.UTF-8’.  The older name ‘de_DE’
+still refers to the German locale as of 2000 that stores characters in
+ISO-8859-1 encoding -- a text encoding that cannot even accomodate the Euro
+currency sign.
+
+
    
+
    
+Some locale names use ‘ll_CC.@variant’ instead of
+‘ll_CC’.  The ‘@variant’ can denote any kind of
+characteristics that is not already implied by the language ll and
+the country CC.  It can denote a particular monetary unit.  For example,
+on glibc systems, ‘de_DE@euro’ denotes the locale that uses the Euro
+currency, in contrast to the older locale ‘de_DE’ which implies the use
+of the currency before 2002.  It can also denote a dialect of the language,
+or the script used to write text (for example, ‘sr_RS@latin’ uses the
+Latin script, whereas ‘sr_RS’ uses the Cyrillic script to write Serbian),
+or the orthography rules, or similar.
+
+
    
+
    
+On other systems, some variations of this scheme are used, such as
+‘ll’.  You can get the list of locales supported by your system
+for your language by running the command ‘locale -a | grep '^ll'’.
+
+
    
+
    
+There is also a special locale, called ‘C’.
+When it is used, it disables all localization: in this locale, all programs
+standardized by POSIX use English messages and an unspecified character
+encoding (often US-ASCII, but sometimes also ISO-8859-1 or UTF-8, depending on
+the operating system).
+
+
    
+
+
+
    2.3.2  Locale Environment Variables
    
+
    
+
+
 
+
+
    
+
    
+A locale is composed of several locale categories, see section 1.3  Aspects in Native Language Support.
+When a program looks up locale dependent values, it does this according to
+the following environment variables, in priority order:
+
+
    
+
+
      
+
    1. LANGUAGE
+
 
+ 
 
+
    2. LC_ALL
+
+
+
+
+
+
+
+
    3. LC_xxx, according to selected locale category:
+
+LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE,
+LC_MONETARY, LC_MESSAGES, ...
+
+
    4. LANG
+
+
    
+
+
    
+Variables whose value is set but is empty are ignored in this lookup.
 
 
    
 
    
-
-We consider here those packages using GNU gettext internally,
-and for which the installers did not disable translation at
-configure time.  Then, users only have to set the LANG
-environment variable to the appropriate ‘ll_CC’
-combination prior to using the programs in the package.  See section 2.1  The Current ‘ABOUT-NLS’ Matrix.
-For example, let's presume a German site.  At the shell prompt, users
-merely have to execute ‘setenv LANG de_DE’ (in csh) or
-‘export LANG; LANG=de_DE’ (in sh).  They could even do
-this from their ‘.login’ or ‘.profile’ file.
+LANG is the normal environment variable for specifying a locale.
+As a user, you normally set this variable (unless some of the other variables
+have already been set by the system, in ‘/etc/profile’ or similar
+initialization files).
+
+
    
+
    
+LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE,
+LC_MONETARY, LC_MESSAGES, and so on, are the environment
+variables meant to override LANG and affecting a single locale
+category only.  For example, assume you are a Swedish user in Spain, and you
+want your programs to handle numbers and dates according to Spanish
+conventions, and only the messages should be in Swedish.  Then you could
+create a locale named ‘sv_ES’ or ‘sv_ES.UTF-8’ by use of the
+localedef program.  But it is simpler, and achieves the same effect,
+to set the LANG variable to es_ES.UTF-8 and the
+LC_MESSAGES variable to sv_SE.UTF-8; these two locales come
+already preinstalled with the operating system.
+
+
    
+
    
+LC_ALL is an environment variable that overrides all of these.
+It is typically used in scripts that run particular programs.  For example,
+configure scripts generated by GNU autoconf use LC_ALL to make
+sure that the configuration tests don't operate in locale dependent ways.
+
+
    
+
    
+Some systems, unfortunately, set LC_ALL in ‘/etc/profile’ or in
+similar initialization files.  As a user, you therefore have to unset this
+variable if you want to set LANG and optionally some of the other
+LC_xxx variables.
+
+
    
+
    
+The LANGUAGE variable is described in the next subsection.
+
+
    
+
+
+
    2.3.3  Specifying a Priority List of Languages
    
+
+
    
+Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+LANGUAGE.  GNU gettext gives preference to LANGUAGE
+over LC_ALL and LANG for the purpose of message handling,
+but you still need to have LANG (or LC_ALL) set to the primary
+language; this is required by other parts of the system libraries.
+For example, some Swedish users who would rather read translations in
+German than English for when Swedish is not available, set LANGUAGE
+to ‘sv:de’ while leaving LANG to ‘sv_SE’.
+
+
    
+
    
+Special advice for Norwegian users: The language code for Norwegian
+bokm@ringaccent{a}l changed from ‘no’ to ‘nb’ recently (in 2003).
+During the transition period, while some message catalogs for this language
+are installed under ‘nb’ and some older ones under ‘no’, it is
+recommended for Norwegian users to set LANGUAGE to ‘nb:no’ so that
+both newer and older translations are used.
+
+
    
+
    
+In the LANGUAGE environment variable, but not in the other
+environment variables, ‘ll_CC’ combinations can be
+abbreviated as ‘ll’ to denote the language's main dialect.
+For example, ‘de’ is equivalent to ‘de_DE’ (German as spoken in
+Germany), and ‘pt’ to ‘pt_PT’ (Portuguese as spoken in Portugal)
+in this context.
+
+
    
+
    
+Note: The variable LANGUAGE is ignored if the locale is set to
+‘C’.  In other words, you have to first enable localization, by setting
+LANG (or LC_ALL) to a value other than ‘C’, before you can
+use a language priority list through the LANGUAGE variable.
+
+
    
+
+
+
    2.4  Installing Translations for Particular Programs
    
+
    
+
+
+
+
    
+
    
+Languages are not equally well supported in all packages using GNU
+gettext, and more translations are added over time.  Usually, you
+use the translations that are shipped with the operating system
+or with particular packages that you install afterwards.  But you can also
+install newer localizations directly.  For doing this, you will need an
+understanding where each localization file is stored on the file system.
+
+
    
+
    
+
+For programs that participate in the Translation Project, you can start
+looking for translations here:
+http://translationproject.org/team/index.html.
+A snapshot of this information is also found in the ‘ABOUT-NLS’ file
+that is shipped with GNU gettext.
+
+
    
+
    
+For programs that are part of the KDE project, the starting point is:
+http://i18n.kde.org/.
+
+
    
+
    
+For programs that are part of the GNOME project, the starting point is:
+http://www.gnome.org/i18n/.
+
+
    
+
    
+For other programs, you may check whether the program's source code package
+contains some ‘ll.po’ files; often they are kept together in a
+directory called ‘po/’.  Each ‘ll.po’ file contains the
+message translations for the language whose abbreviation of ll.
 
 
    
 
    
diff --git a/gettext-tools/doc/gettext_20.html b/gettext-tools/doc/gettext_20.html
index ffec300c9..035dd25e3 100644
--- a/gettext-tools/doc/gettext_20.html
+++ b/gettext-tools/doc/gettext_20.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - Program Index
@@ -11,7 +11,7 @@ Go to the first, previous
 
    
 
 
-
    Program Index
    
+
    Program Index
    
 
 
    
 Jump to:
@@ -31,45 +31,45 @@ Jump to:
 
    
 
    a
    
 
-
  • autopoint
+
  • autopoint
 
    • 
 
    e
    
 
-
  • envsubst
+
  • envsubst
 
    • 
 
    g
    
 
-
  • gettext, gettext
-
  • gettextize
+
  • gettext, gettext
+
  • gettextize
 
    • 
 
    m
    
 
-
  • msgattrib
-
  • msgcat
-
  • msgcmp
-
  • msgcomm
-
  • msgconv
-
  • msgen
-
  • msgexec
-
  • msgfilter
-
  • msgfmt
-
  • msggrep
-
  • msginit
-
  • msgmerge
-
  • msgunfmt
-
  • msguniq
+
  • msgattrib
+
  • msgcat
+
  • msgcmp
+
  • msgcomm
+
  • msgconv
+
  • msgen
+
  • msgexec
+
  • msgfilter
+
  • msgfmt
+
  • msggrep
+
  • msginit
+
  • msgmerge
+
  • msgunfmt
+
  • msguniq
 
    • 
 
    n
    
 
-
  • ngettext, ngettext
+
  • ngettext, ngettext
 
    • 
 
    r
    
 
-
  • recode-sr-latin
+
  • recode-sr-latin
 
    • 
 
    x
    
 
-
  • xgettext
+
  • xgettext
 
    • 
 
 
    
diff --git a/gettext-tools/doc/gettext_21.html b/gettext-tools/doc/gettext_21.html
index 237aa6683..abcb28810 100644
--- a/gettext-tools/doc/gettext_21.html
+++ b/gettext-tools/doc/gettext_21.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - Option Index
@@ -11,7 +11,7 @@ Go to the first, previous
 
    
 
 
-
    Option Index
    
+
    Option Index
    
 
 
    
 Jump to:
@@ -19,556 +19,562 @@ Jump to:
 
    
 
    -
    
 
-
  • --add-comments, xgettext option
-
  • --add-location, msgattrib option
-
  • --add-location, msgcat option
-
  • --add-location, msgcomm option
-
  • --add-location, msgconv option
-
  • --add-location, msgen option
-
  • --add-location, msgfilter option
-
  • --add-location, msggrep option
-
  • --add-location, msgmerge option
-
  • --add-location, msguniq option
-
  • --add-location, xgettext option
-
  • --alignment, msgfmt option
-
  • --backup, msgmerge option
-
  • --boost, xgettext option
-
  • --c++, xgettext option
-
  • --check, msgfmt option
-
  • --check-accelerators, msgfmt option
-
  • --check-compatibility, msgfmt option
-
  • --check-domain, msgfmt option
-
  • --check-format, msgfmt option
-
  • --check-header, msgfmt option
-
  • --clear-fuzzy, msgattrib option
-
  • --clear-obsolete, msgattrib option
-
  • --clear-previous, msgattrib option
-
  • --comment, msggrep option
-
  • --compendium, msgmerge option
-
  • --copyright-holder, xgettext option
-
  • --csharp, msgfmt option
-
  • --csharp, msgunfmt option
-
  • --csharp-resources, msgfmt option
-
  • --csharp-resources, msgunfmt option
-
  • --debug, xgettext option
-
  • --default-domain, xgettext option
-
  • --directory, msgattrib option
-
  • --directory, msgcat option
-
  • --directory, msgcmp option
-
  • --directory, msgcomm option
-
  • --directory, msgconv option
-
  • --directory, msgen option
-
  • --directory, msgexec option
-
  • --directory, msgfilter option
-
  • --directory, msgfmt option
-
  • --directory, msggrep option
-
  • --directory, msgmerge option
-
  • --directory, msguniq option
-
  • --directory, xgettext option
-
  • --domain, gettext option
-
  • --domain, msggrep option
-
  • --domain, ngettext option
-
  • --dry-run, autopoint option
-
  • --dry-run, gettextize option
-
  • --exclude-file, xgettext option
-
  • --expression, msgfilter option
-
  • --extended-regexp, msggrep option
-
  • --extract-all, xgettext option
-
  • --extracted-comment, msggrep option
-
  • --file, msgfilter option
-
  • --file, msggrep option
-
  • --files-from, msgcat option
-
  • --files-from, msgcomm option
-
  • --files-from, xgettext option
-
  • --fixed-strings, msggrep option
-
  • --flag, xgettext option
-
  • --force, autopoint option
-
  • --force, gettextize option
-
  • --force-po, msgattrib option
-
  • --force-po, msgcat option
-
  • --force-po, msgcomm option
-
  • --force-po, msgconv option
-
  • --force-po, msgen option
-
  • --force-po, msgfilter option
-
  • --force-po, msggrep option
-
  • --force-po, msgmerge option
-
  • --force-po, msgunfmt option
-
  • --force-po, msguniq option
-
  • --force-po, xgettext option
-
  • --foreign-user, xgettext option
-
  • --from-code, xgettext option
-
  • --fuzzy, msgattrib option
-
  • --help, autopoint option
-
  • --help, envsubst option
-
  • --help, gettext option
-
  • --help, gettextize option
-
  • --help, msgattrib option
-
  • --help, msgcat option
-
  • --help, msgcmp option
-
  • --help, msgcomm option
-
  • --help, msgconv option
-
  • --help, msgen option
-
  • --help, msgexec option
-
  • --help, msgfilter option
-
  • --help, msgfmt option
-
  • --help, msggrep option
-
  • --help, msginit option
-
  • --help, msgmerge option
-
  • --help, msgunfmt option
-
  • --help, msguniq option
-
  • --help, ngettext option
-
  • --help, xgettext option
-
  • --ignore-case, msggrep option
-
  • --ignore-file, msgattrib option
-
  • --indent, msgattrib option
-
  • --indent, msgcat option
-
  • --indent, msgcomm option
-
  • --indent, msgconv option
-
  • --indent, msgen option
-
  • --indent, msgfilter option
-
  • --indent, msggrep option
-
  • --indent, msgmerge option
-
  • --indent, msgunfmt option
-
  • --indent, msguniq option
-
  • --indent, xgettext option
-
  • --input, msgexec option
-
  • --input, msgfilter option
-
  • --input, msginit option
-
  • --intl, gettextize option
-
  • --invert-match, msggrep option
-
  • --java, msgfmt option
-
  • --java, msgunfmt option
-
  • --java2, msgfmt option
-
  • --join-existing, xgettext option
-
  • --keep-header, msgfilter option
-
  • --keyword, xgettext option
-
  • --language, xgettext option
-
  • --less-than, msgcat option
-
  • --less-than, msgcomm option
-
  • --locale, msgfmt option, --locale, msgfmt option, --locale, msgfmt option
-
  • --locale, msginit option
-
  • --locale, msgunfmt option, --locale, msgunfmt option, --locale, msgunfmt option
-
  • --location, msggrep option
-
  • --more-than, msgcat option
-
  • --more-than, msgcomm option
-
  • --msgctxt, msggrep option
-
  • --msgid, msggrep option
-
  • --msgid-bugs-address, xgettext option
-
  • --msgstr, msggrep option
-
  • --msgstr-prefix, xgettext option
-
  • --msgstr-suffix, xgettext option
-
  • --multi-domain, msgcmp option
-
  • --multi-domain, msgmerge option
-
  • --no-changelog, gettextize option
-
  • --no-fuzzy, msgattrib option
-
  • --no-fuzzy-matching, msgmerge option
-
  • --no-hash, msgfmt option
-
  • --no-location, msgattrib option
-
  • --no-location, msgcat option
-
  • --no-location, msgcomm option
-
  • --no-location, msgconv option
-
  • --no-location, msgen option
-
  • --no-location, msgfilter option
-
  • --no-location, msggrep option
-
  • --no-location, msgmerge option
-
  • --no-location, msguniq option
-
  • --no-location, xgettext option
-
  • --no-obsolete, msgattrib option
-
  • --no-translator, msginit option
-
  • --no-wrap, msgattrib option
-
  • --no-wrap, msgcat option
-
  • --no-wrap, msgcomm option
-
  • --no-wrap, msgconv option
-
  • --no-wrap, msgen option
-
  • --no-wrap, msgfilter option
-
  • --no-wrap, msggrep option
-
  • --no-wrap, msginit option
-
  • --no-wrap, msgmerge option
-
  • --no-wrap, msgunfmt option
-
  • --no-wrap, msguniq option
-
  • --no-wrap, xgettext option
-
  • --obsolete, msgattrib option
-
  • --omit-header, msgcomm option
-
  • --omit-header, xgettext option
-
  • --only-file, msgattrib option
-
  • --only-fuzzy, msgattrib option
-
  • --only-obsolete, msgattrib option
-
  • --output, xgettext option
-
  • --output-dir, xgettext option
-
  • --output-file, msgattrib option
-
  • --output-file, msgcat option
-
  • --output-file, msgcomm option
-
  • --output-file, msgconv option
-
  • --output-file, msgen option
-
  • --output-file, msgfilter option
-
  • --output-file, msgfmt option
-
  • --output-file, msggrep option
-
  • --output-file, msginit option
-
  • --output-file, msgmerge option
-
  • --output-file, msgunfmt option
-
  • --output-file, msguniq option
-
  • --previous, msgmerge option
-
  • --properties-input, msgattrib option
-
  • --properties-input, msgcat option
-
  • --properties-input, msgcmp option
-
  • --properties-input, msgcomm option
-
  • --properties-input, msgconv option
-
  • --properties-input, msgen option
-
  • --properties-input, msgexec option
-
  • --properties-input, msgfilter option
-
  • --properties-input, msgfmt option
-
  • --properties-input, msggrep option
-
  • --properties-input, msginit option
-
  • --properties-input, msgmerge option
-
  • --properties-input, msguniq option
-
  • --properties-output, msgattrib option
-
  • --properties-output, msgcat option
-
  • --properties-output, msgcomm option
-
  • --properties-output, msgconv option
-
  • --properties-output, msgen option
-
  • --properties-output, msgfilter option
-
  • --properties-output, msggrep option
-
  • --properties-output, msginit option
-
  • --properties-output, msgmerge option
-
  • --properties-output, msgunfmt option
-
  • --properties-output, msguniq option
-
  • --properties-output, xgettext option
-
  • --qt, msgfmt option
-
  • --qt, xgettext option
-
  • --quiet, msgfilter option
-
  • --quiet, msgmerge option
-
  • --regexp=, msggrep option
-
  • --repeated, msguniq option
-
  • --resource, msgfmt option, --resource, msgfmt option
-
  • --resource, msgunfmt option, --resource, msgunfmt option
-
  • --set-fuzzy, msgattrib option
-
  • --set-obsolete, msgattrib option
-
  • --silent, msgfilter option
-
  • --silent, msgmerge option
-
  • --sort-by-file, msgattrib option
-
  • --sort-by-file, msgcat option
-
  • --sort-by-file, msgcomm option
-
  • --sort-by-file, msgconv option
-
  • --sort-by-file, msgen option
-
  • --sort-by-file, msgfilter option
-
  • --sort-by-file, msggrep option
-
  • --sort-by-file, msgmerge option
-
  • --sort-by-file, msguniq option
-
  • --sort-by-file, xgettext option
-
  • --sort-output, msgattrib option
-
  • --sort-output, msgcat option
-
  • --sort-output, msgcomm option
-
  • --sort-output, msgconv option
-
  • --sort-output, msgen option
-
  • --sort-output, msgfilter option
-
  • --sort-output, msggrep option
-
  • --sort-output, msgmerge option
-
  • --sort-output, msgunfmt option
-
  • --sort-output, msguniq option
-
  • --sort-output, xgettext option
-
  • --statistics, msgfmt option
-
  • --strict, msgattrib option
-
  • --strict, msgcat option
-
  • --strict, msgcomm option
-
  • --strict, msgconv option
-
  • --strict, msgen option
-
  • --strict, msgfilter option
-
  • --strict, msgfmt option
-
  • --strict, msggrep option
-
  • --strict, msgmerge option
-
  • --strict, msgunfmt option
-
  • --strict, msguniq option
-
  • --strict, xgettext option
-
  • --stringtable-input, msgattrib option
-
  • --stringtable-input, msgcat option
-
  • --stringtable-input, msgcmp option
-
  • --stringtable-input, msgcomm option
-
  • --stringtable-input, msgen option
-
  • --stringtable-input, msgexec option
-
  • --stringtable-input, msgfilter option
-
  • --stringtable-input, msgfmt option
-
  • --stringtable-input, msggrep option
-
  • --stringtable-input, msginit option
-
  • --stringtable-input, msgmerge option
-
  • --stringtable-input, msgonv option
-
  • --stringtable-input, msguniq option
-
  • --stringtable-output, msgattrib option
-
  • --stringtable-output, msgcat option
-
  • --stringtable-output, msgcomm option
-
  • --stringtable-output, msgconv option
-
  • --stringtable-output, msgen option
-
  • --stringtable-output, msgfilter option
-
  • --stringtable-output, msggrep option
-
  • --stringtable-output, msginit option
-
  • --stringtable-output, msgmerge option
-
  • --stringtable-output, msgunfmt option
-
  • --stringtable-output, msguniq option
-
  • --stringtable-output, xgettext option
-
  • --suffix, msgmerge option
-
  • --symlink, gettextize option
-
  • --tcl, msgfmt option
-
  • --tcl, msgunfmt option
-
  • --to-code, msgcat option
-
  • --to-code, msgconv option
-
  • --to-code, msguniq option
-
  • --translated, msgattrib option
-
  • --trigraphs, xgettext option
-
  • --unique, msgcat option
-
  • --unique, msgcomm option
-
  • --unique, msguniq option
-
  • --untranslated, msgattrib option
-
  • --update, msgmerge option
-
  • --use-first, msgcat option
-
  • --use-first, msguniq option
-
  • --use-fuzzy, msgcmp option
-
  • --use-fuzzy, msgfmt option
-
  • --use-untranslated, msgcmp option
-
  • --variables, envsubst option
-
  • --verbose, msgfmt option
-
  • --verbose, msgmerge option
-
  • --verbose, msgunfmt option
-
  • --version, autopoint option
-
  • --version, envsubst option
-
  • --version, gettext option
-
  • --version, gettextize option
-
  • --version, msgattrib option
-
  • --version, msgcat option
-
  • --version, msgcmp option
-
  • --version, msgcomm option
-
  • --version, msgconv option
-
  • --version, msgen option
-
  • --version, msgexec option
-
  • --version, msgfilter option
-
  • --version, msgfmt option
-
  • --version, msggrep option
-
  • --version, msginit option
-
  • --version, msgmerge option
-
  • --version, msgunfmt option
-
  • --version, msguniq option
-
  • --version, ngettext option
-
  • --version, xgettext option
-
  • --width, msgattrib option
-
  • --width, msgcat option
-
  • --width, msgcomm option
-
  • --width, msgconv option
-
  • --width, msgen option
-
  • --width, msgfilter option
-
  • --width, msggrep option
-
  • --width, msginit option
-
  • --width, msgmerge option
-
  • --width, msgunfmt option
-
  • --width, msguniq option
-
  • --width, xgettext option
-
  • -<, msgcat option
-
  • -<, msgcomm option
-
  • ->, msgcat option
-
  • ->, msgcomm option
-
  • -a, msgfmt option
-
  • -a, xgettext option
-
  • -C, msgfmt option
-
  • -c, msgfmt option
-
  • -C, msggrep option
-
  • -C, msgmerge option
-
  • -C, xgettext option
-
  • -c, xgettext option
-
  • -d, autopoint option
-
  • -d, gettext option
-
  • -d, gettextize option
-
  • -D, msgattrib option
-
  • -D, msgcat option
-
  • -D, msgcmp option
-
  • -D, msgcomm option
-
  • -D, msgconv option
-
  • -D, msgen option
-
  • -D, msgexec option
-
  • -D, msgfilter option
-
  • -d, msgfmt option, -d, msgfmt option, -d, msgfmt option
-
  • -D, msgfmt option
-
  • -D, msggrep option
-
  • -D, msgmerge option
-
  • -d, msgunfmt option, -d, msgunfmt option
-
  • -D, msguniq option
-
  • -d, msguniq option
-
  • -d, ngettext option
-
  • -D, xgettext option
-
  • -d, xgettext option
-
  • -e, gettext option
-
  • -E, gettext option
-
  • -e, msgfilter option
-
  • -E, msggrep option
-
  • -e, msggrep option
-
  • -e, ngettext option
-
  • -E, ngettext option
-
  • -f, autopoint option
-
  • -f, gettextize option
-
  • -F, msgattrib option
-
  • -f, msgcat option
-
  • -F, msgcat option
-
  • -F, msgcomm option
-
  • -f, msgcomm option
-
  • -F, msgconv option
-
  • -F, msgen option
-
  • -F, msgfilter option
-
  • -f, msgfilter option
-
  • -f, msgfmt option
-
  • -f, msggrep option
-
  • -F, msggrep option
-
  • -F, msgmerge option
-
  • -F, msguniq option
-
  • -F, xgettext option
-
  • -f, xgettext option
-
  • -h, envsubst option
-
  • -h, gettext option
-
  • -h, msgattrib option
-
  • -h, msgcat option
-
  • -h, msgcmp option
-
  • -h, msgcomm option
-
  • -h, msgconv option
-
  • -h, msgen option
-
  • -h, msgexec option
-
  • -h, msgfilter option
-
  • -h, msgfmt option
-
  • -h, msggrep option
-
  • -h, msginit option
-
  • -h, msgmerge option
-
  • -h, msgunfmt option
-
  • -h, msguniq option
-
  • -h, ngettext option
-
  • -h, xgettext option
-
  • -i, msgattrib option
-
  • -i, msgcat option
-
  • -i, msgcomm option
-
  • -i, msgconv option
-
  • -i, msgen option
-
  • -i, msgexec option
-
  • -i, msgfilter option
-
  • -i, msggrep option
-
  • -i, msginit option
-
  • -i, msgmerge option
-
  • -i, msgunfmt option
-
  • -i, msguniq option
-
  • -i, xgettext option
-
  • -j, msgfmt option
-
  • -J, msggrep option
-
  • -j, msgunfmt option
-
  • -j, xgettext option
-
  • -K, msggrep option
-
  • -k, xgettext option
-
  • -l, msgfmt option, -l, msgfmt option, -l, msgfmt option
-
  • -l, msginit option
-
  • -l, msgunfmt option, -l, msgunfmt option, -l, msgunfmt option
-
  • -L, xgettext option
-
  • -m, msgcmp option
-
  • -M, msggrep option
-
  • -m, msgmerge option
-
  • -M, xgettext option
-
  • -m, xgettext option
-
  • -n, gettext option
-
  • -n, msgattrib option
-
  • -n, msgcat option
-
  • -n, msgcomm option
-
  • -n, msgfilter option
-
  • -N, msggrep option
-
  • -N, msgmerge option
-
  • -n, msguniq option
-
  • -n, xgettext option
-
  • -o, msgattrib option
-
  • -o, msgcat option
-
  • -o, msgcomm option
-
  • -o, msgconv option
-
  • -o, msgen option
-
  • -o, msgfilter option
-
  • -o, msgfmt option
-
  • -o, msggrep option
-
  • -o, msginit option
-
  • -o, msgmerge option
-
  • -o, msgunfmt option
-
  • -o, msguniq option
-
  • -o, xgettext option
-
  • -P, msgattrib option
-
  • -p, msgattrib option
-
  • -P, msgcat option
-
  • -p, msgcat option
-
  • -P, msgcmp option
-
  • -P, msgcomm option
-
  • -p, msgcomm option
-
  • -P, msgconv option
-
  • -p, msgconv option
-
  • -P, msgen option
-
  • -p, msgen option
-
  • -P, msgexec option
-
  • -P, msgfilter option
-
  • -p, msgfilter option
-
  • -P, msgfmt option
-
  • -p, msggrep option
-
  • -P, msggrep option
-
  • -P, msginit option
-
  • -p, msginit option
-
  • -p, msgmerge option
-
  • -P, msgmerge option
-
  • -p, msgunfmt option
-
  • -p, msguniq option
-
  • -P, msguniq option
-
  • -p, xgettext option
-
  • -q, msgmerge option
-
  • -r, msgfmt option, -r, msgfmt option
-
  • -r, msgunfmt option, -r, msgunfmt option
-
  • -s, msgattrib option
-
  • -s, msgcat option
-
  • -s, msgcomm option
-
  • -s, msgconv option
-
  • -s, msgen option
-
  • -s, msgfilter option
-
  • -s, msgmerge option
-
  • -s, msgunfmt option
-
  • -s, msguniq option
-
  • -s, xgettext option
-
  • -t, msgcat option
-
  • -t, msgconv option
-
  • -T, msggrep option
-
  • -t, msguniq option
-
  • -T, xgettext option
-
  • -u, msgcat option
-
  • -u, msgcomm option
-
  • -U, msgmerge option
-
  • -u, msguniq option
-
  • -v, envsubst option
-
  • -V, envsubst option
-
  • -V, gettext option
-
  • -V, msgattrib option
-
  • -V, msgcat option
-
  • -V, msgcmp option
-
  • -V, msgcomm option
-
  • -V, msgconv option
-
  • -V, msgen option
-
  • -V, msgexec option
-
  • -V, msgfilter option
-
  • -V, msgfmt option
-
  • -v, msgfmt option
-
  • -V, msggrep option
-
  • -v, msggrep option
-
  • -V, msginit option
-
  • -v, msgmerge option
-
  • -V, msgmerge option
-
  • -v, msgunfmt option
-
  • -V, msgunfmt option
-
  • -V, msguniq option
-
  • -V, ngettext option
-
  • -V, xgettext option
-
  • -w, msgattrib option
-
  • -w, msgcat option
-
  • -w, msgcomm option
-
  • -w, msgconv option
-
  • -w, msgen option
-
  • -w, msgfilter option
-
  • -w, msggrep option
-
  • -w, msginit option
-
  • -w, msgmerge option
-
  • -w, msgunfmt option
-
  • -w, msguniq option
-
  • -w, xgettext option
-
  • -X, msggrep option
-
  • -x, xgettext option
+
  • --add-comments, xgettext option
+
  • --add-location, msgattrib option
+
  • --add-location, msgcat option
+
  • --add-location, msgcomm option
+
  • --add-location, msgconv option
+
  • --add-location, msgen option
+
  • --add-location, msgfilter option
+
  • --add-location, msggrep option
+
  • --add-location, msgmerge option
+
  • --add-location, msguniq option
+
  • --add-location, xgettext option
+
  • --alignment, msgfmt option
+
  • --backup, msgmerge option
+
  • --boost, xgettext option
+
  • --c++, xgettext option
+
  • --check, msgfmt option
+
  • --check-accelerators, msgfmt option
+
  • --check-compatibility, msgfmt option
+
  • --check-domain, msgfmt option
+
  • --check-format, msgfmt option
+
  • --check-header, msgfmt option
+
  • --clear-fuzzy, msgattrib option
+
  • --clear-obsolete, msgattrib option
+
  • --clear-previous, msgattrib option
+
  • --color, msgcat option, --color, msgcat option
+
  • --comment, msggrep option
+
  • --compendium, msgmerge option
+
  • --copyright-holder, xgettext option
+
  • --csharp, msgfmt option
+
  • --csharp, msgunfmt option
+
  • --csharp-resources, msgfmt option
+
  • --csharp-resources, msgunfmt option
+
  • --debug, xgettext option
+
  • --default-domain, xgettext option
+
  • --directory, msgattrib option
+
  • --directory, msgcat option
+
  • --directory, msgcmp option
+
  • --directory, msgcomm option
+
  • --directory, msgconv option
+
  • --directory, msgen option
+
  • --directory, msgexec option
+
  • --directory, msgfilter option
+
  • --directory, msgfmt option
+
  • --directory, msggrep option
+
  • --directory, msgmerge option
+
  • --directory, msguniq option
+
  • --directory, xgettext option
+
  • --domain, gettext option
+
  • --domain, msggrep option
+
  • --domain, ngettext option
+
  • --dry-run, autopoint option
+
  • --dry-run, gettextize option
+
  • --exclude-file, xgettext option
+
  • --expression, msgfilter option
+
  • --extended-regexp, msggrep option
+
  • --extract-all, xgettext option
+
  • --extracted-comment, msggrep option
+
  • --file, msgfilter option
+
  • --file, msggrep option
+
  • --files-from, msgcat option
+
  • --files-from, msgcomm option
+
  • --files-from, xgettext option
+
  • --fixed-strings, msggrep option
+
  • --flag, xgettext option
+
  • --force, autopoint option
+
  • --force, gettextize option
+
  • --force-po, msgattrib option
+
  • --force-po, msgcat option
+
  • --force-po, msgcomm option
+
  • --force-po, msgconv option
+
  • --force-po, msgen option
+
  • --force-po, msgfilter option
+
  • --force-po, msggrep option
+
  • --force-po, msgmerge option
+
  • --force-po, msgunfmt option
+
  • --force-po, msguniq option
+
  • --force-po, xgettext option
+
  • --foreign-user, xgettext option
+
  • --from-code, xgettext option
+
  • --fuzzy, msgattrib option
+
  • --help, autopoint option
+
  • --help, envsubst option
+
  • --help, gettext option
+
  • --help, gettextize option
+
  • --help, msgattrib option
+
  • --help, msgcat option
+
  • --help, msgcmp option
+
  • --help, msgcomm option
+
  • --help, msgconv option
+
  • --help, msgen option
+
  • --help, msgexec option
+
  • --help, msgfilter option
+
  • --help, msgfmt option
+
  • --help, msggrep option
+
  • --help, msginit option
+
  • --help, msgmerge option
+
  • --help, msgunfmt option
+
  • --help, msguniq option
+
  • --help, ngettext option
+
  • --help, xgettext option
+
  • --ignore-case, msggrep option
+
  • --ignore-file, msgattrib option
+
  • --indent, msgattrib option
+
  • --indent, msgcat option
+
  • --indent, msgcomm option
+
  • --indent, msgconv option
+
  • --indent, msgen option
+
  • --indent, msgfilter option
+
  • --indent, msggrep option
+
  • --indent, msgmerge option
+
  • --indent, msgunfmt option
+
  • --indent, msguniq option
+
  • --indent, xgettext option
+
  • --input, msgexec option
+
  • --input, msgfilter option
+
  • --input, msginit option
+
  • --intl, gettextize option
+
  • --invert-match, msggrep option
+
  • --java, msgfmt option
+
  • --java, msgunfmt option
+
  • --java2, msgfmt option
+
  • --join-existing, xgettext option
+
  • --kde, xgettext option
+
  • --keep-header, msgfilter option
+
  • --keyword, xgettext option
+
  • --language, xgettext option
+
  • --less-than, msgcat option
+
  • --less-than, msgcomm option
+
  • --locale, msgfmt option, --locale, msgfmt option, --locale, msgfmt option
+
  • --locale, msginit option
+
  • --locale, msgunfmt option, --locale, msgunfmt option, --locale, msgunfmt option
+
  • --location, msggrep option
+
  • --more-than, msgcat option
+
  • --more-than, msgcomm option
+
  • --msgctxt, msggrep option
+
  • --msgid, msggrep option
+
  • --msgid-bugs-address, xgettext option
+
  • --msgstr, msggrep option
+
  • --msgstr-prefix, xgettext option
+
  • --msgstr-suffix, xgettext option
+
  • --multi-domain, msgcmp option
+
  • --multi-domain, msgmerge option
+
  • --no-changelog, gettextize option
+
  • --no-fuzzy, msgattrib option
+
  • --no-fuzzy-matching, msgmerge option
+
  • --no-hash, msgfmt option
+
  • --no-location, msgattrib option
+
  • --no-location, msgcat option
+
  • --no-location, msgcomm option
+
  • --no-location, msgconv option
+
  • --no-location, msgen option
+
  • --no-location, msgfilter option
+
  • --no-location, msggrep option
+
  • --no-location, msgmerge option
+
  • --no-location, msguniq option
+
  • --no-location, xgettext option
+
  • --no-obsolete, msgattrib option
+
  • --no-translator, msginit option
+
  • --no-wrap, msgattrib option
+
  • --no-wrap, msgcat option
+
  • --no-wrap, msgcomm option
+
  • --no-wrap, msgconv option
+
  • --no-wrap, msgen option
+
  • --no-wrap, msgfilter option
+
  • --no-wrap, msggrep option
+
  • --no-wrap, msginit option
+
  • --no-wrap, msgmerge option
+
  • --no-wrap, msgunfmt option
+
  • --no-wrap, msguniq option
+
  • --no-wrap, xgettext option
+
  • --obsolete, msgattrib option
+
  • --omit-header, msgcomm option
+
  • --omit-header, xgettext option
+
  • --only-file, msgattrib option
+
  • --only-fuzzy, msgattrib option
+
  • --only-obsolete, msgattrib option
+
  • --output, xgettext option
+
  • --output-dir, xgettext option
+
  • --output-file, msgattrib option
+
  • --output-file, msgcat option
+
  • --output-file, msgcomm option
+
  • --output-file, msgconv option
+
  • --output-file, msgen option
+
  • --output-file, msgfilter option
+
  • --output-file, msgfmt option
+
  • --output-file, msggrep option
+
  • --output-file, msginit option
+
  • --output-file, msgmerge option
+
  • --output-file, msgunfmt option
+
  • --output-file, msguniq option
+
  • --package-name, xgettext option
+
  • --package-version, xgettext option
+
  • --po-dir, gettextize option
+
  • --previous, msgmerge option
+
  • --properties-input, msgattrib option
+
  • --properties-input, msgcat option
+
  • --properties-input, msgcmp option
+
  • --properties-input, msgcomm option
+
  • --properties-input, msgconv option
+
  • --properties-input, msgen option
+
  • --properties-input, msgexec option
+
  • --properties-input, msgfilter option
+
  • --properties-input, msgfmt option
+
  • --properties-input, msggrep option
+
  • --properties-input, msginit option
+
  • --properties-input, msgmerge option
+
  • --properties-input, msguniq option
+
  • --properties-output, msgattrib option
+
  • --properties-output, msgcat option
+
  • --properties-output, msgcomm option
+
  • --properties-output, msgconv option
+
  • --properties-output, msgen option
+
  • --properties-output, msgfilter option
+
  • --properties-output, msggrep option
+
  • --properties-output, msginit option
+
  • --properties-output, msgmerge option
+
  • --properties-output, msgunfmt option
+
  • --properties-output, msguniq option
+
  • --properties-output, xgettext option
+
  • --qt, msgfmt option
+
  • --qt, xgettext option
+
  • --quiet, msgfilter option
+
  • --quiet, msgmerge option
+
  • --regexp=, msggrep option
+
  • --repeated, msguniq option
+
  • --resource, msgfmt option, --resource, msgfmt option
+
  • --resource, msgunfmt option, --resource, msgunfmt option
+
  • --set-fuzzy, msgattrib option
+
  • --set-obsolete, msgattrib option
+
  • --silent, msgfilter option
+
  • --silent, msgmerge option
+
  • --sort-by-file, msgattrib option
+
  • --sort-by-file, msgcat option
+
  • --sort-by-file, msgcomm option
+
  • --sort-by-file, msgconv option
+
  • --sort-by-file, msgen option
+
  • --sort-by-file, msgfilter option
+
  • --sort-by-file, msggrep option
+
  • --sort-by-file, msgmerge option
+
  • --sort-by-file, msguniq option
+
  • --sort-by-file, xgettext option
+
  • --sort-output, msgattrib option
+
  • --sort-output, msgcat option
+
  • --sort-output, msgcomm option
+
  • --sort-output, msgconv option
+
  • --sort-output, msgen option
+
  • --sort-output, msgfilter option
+
  • --sort-output, msggrep option
+
  • --sort-output, msgmerge option
+
  • --sort-output, msgunfmt option
+
  • --sort-output, msguniq option
+
  • --sort-output, xgettext option
+
  • --statistics, msgfmt option
+
  • --strict, msgattrib option
+
  • --strict, msgcat option
+
  • --strict, msgcomm option
+
  • --strict, msgconv option
+
  • --strict, msgen option
+
  • --strict, msgfilter option
+
  • --strict, msgfmt option
+
  • --strict, msggrep option
+
  • --strict, msgmerge option
+
  • --strict, msgunfmt option
+
  • --strict, msguniq option
+
  • --strict, xgettext option
+
  • --stringtable-input, msgattrib option
+
  • --stringtable-input, msgcat option
+
  • --stringtable-input, msgcmp option
+
  • --stringtable-input, msgcomm option
+
  • --stringtable-input, msgen option
+
  • --stringtable-input, msgexec option
+
  • --stringtable-input, msgfilter option
+
  • --stringtable-input, msgfmt option
+
  • --stringtable-input, msggrep option
+
  • --stringtable-input, msginit option
+
  • --stringtable-input, msgmerge option
+
  • --stringtable-input, msgonv option
+
  • --stringtable-input, msguniq option
+
  • --stringtable-output, msgattrib option
+
  • --stringtable-output, msgcat option
+
  • --stringtable-output, msgcomm option
+
  • --stringtable-output, msgconv option
+
  • --stringtable-output, msgen option
+
  • --stringtable-output, msgfilter option
+
  • --stringtable-output, msggrep option
+
  • --stringtable-output, msginit option
+
  • --stringtable-output, msgmerge option
+
  • --stringtable-output, msgunfmt option
+
  • --stringtable-output, msguniq option
+
  • --stringtable-output, xgettext option
+
  • --style, msgcat option, --style, msgcat option
+
  • --suffix, msgmerge option
+
  • --symlink, gettextize option
+
  • --tcl, msgfmt option
+
  • --tcl, msgunfmt option
+
  • --to-code, msgcat option
+
  • --to-code, msgconv option
+
  • --to-code, msguniq option
+
  • --translated, msgattrib option
+
  • --trigraphs, xgettext option
+
  • --unique, msgcat option
+
  • --unique, msgcomm option
+
  • --unique, msguniq option
+
  • --untranslated, msgattrib option
+
  • --update, msgmerge option
+
  • --use-first, msgcat option
+
  • --use-first, msguniq option
+
  • --use-fuzzy, msgcmp option
+
  • --use-fuzzy, msgfmt option
+
  • --use-untranslated, msgcmp option
+
  • --variables, envsubst option
+
  • --verbose, msgfmt option
+
  • --verbose, msgmerge option
+
  • --verbose, msgunfmt option
+
  • --version, autopoint option
+
  • --version, envsubst option
+
  • --version, gettext option
+
  • --version, gettextize option
+
  • --version, msgattrib option
+
  • --version, msgcat option
+
  • --version, msgcmp option
+
  • --version, msgcomm option
+
  • --version, msgconv option
+
  • --version, msgen option
+
  • --version, msgexec option
+
  • --version, msgfilter option
+
  • --version, msgfmt option
+
  • --version, msggrep option
+
  • --version, msginit option
+
  • --version, msgmerge option
+
  • --version, msgunfmt option
+
  • --version, msguniq option
+
  • --version, ngettext option
+
  • --version, xgettext option
+
  • --width, msgattrib option
+
  • --width, msgcat option
+
  • --width, msgcomm option
+
  • --width, msgconv option
+
  • --width, msgen option
+
  • --width, msgfilter option
+
  • --width, msggrep option
+
  • --width, msginit option
+
  • --width, msgmerge option
+
  • --width, msgunfmt option
+
  • --width, msguniq option
+
  • --width, xgettext option
+
  • -<, msgcat option
+
  • -<, msgcomm option
+
  • ->, msgcat option
+
  • ->, msgcomm option
+
  • -a, msgfmt option
+
  • -a, xgettext option
+
  • -C, msgfmt option
+
  • -c, msgfmt option
+
  • -C, msggrep option
+
  • -C, msgmerge option
+
  • -C, xgettext option
+
  • -c, xgettext option
+
  • -d, autopoint option
+
  • -d, gettext option
+
  • -d, gettextize option
+
  • -D, msgattrib option
+
  • -D, msgcat option
+
  • -D, msgcmp option
+
  • -D, msgcomm option
+
  • -D, msgconv option
+
  • -D, msgen option
+
  • -D, msgexec option
+
  • -D, msgfilter option
+
  • -d, msgfmt option, -d, msgfmt option, -d, msgfmt option
+
  • -D, msgfmt option
+
  • -D, msggrep option
+
  • -D, msgmerge option
+
  • -d, msgunfmt option, -d, msgunfmt option
+
  • -d, msguniq option
+
  • -D, msguniq option
+
  • -d, ngettext option
+
  • -d, xgettext option
+
  • -D, xgettext option
+
  • -e, gettext option
+
  • -E, gettext option
+
  • -e, msgfilter option
+
  • -e, msggrep option
+
  • -E, msggrep option
+
  • -e, ngettext option
+
  • -E, ngettext option
+
  • -f, autopoint option
+
  • -f, gettextize option
+
  • -F, msgattrib option
+
  • -f, msgcat option
+
  • -F, msgcat option
+
  • -F, msgcomm option
+
  • -f, msgcomm option
+
  • -F, msgconv option
+
  • -F, msgen option
+
  • -F, msgfilter option
+
  • -f, msgfilter option
+
  • -f, msgfmt option
+
  • -f, msggrep option
+
  • -F, msggrep option
+
  • -F, msgmerge option
+
  • -F, msguniq option
+
  • -F, xgettext option
+
  • -f, xgettext option
+
  • -h, envsubst option
+
  • -h, gettext option
+
  • -h, msgattrib option
+
  • -h, msgcat option
+
  • -h, msgcmp option
+
  • -h, msgcomm option
+
  • -h, msgconv option
+
  • -h, msgen option
+
  • -h, msgexec option
+
  • -h, msgfilter option
+
  • -h, msgfmt option
+
  • -h, msggrep option
+
  • -h, msginit option
+
  • -h, msgmerge option
+
  • -h, msgunfmt option
+
  • -h, msguniq option
+
  • -h, ngettext option
+
  • -h, xgettext option
+
  • -i, msgattrib option
+
  • -i, msgcat option
+
  • -i, msgcomm option
+
  • -i, msgconv option
+
  • -i, msgen option
+
  • -i, msgexec option
+
  • -i, msgfilter option
+
  • -i, msggrep option
+
  • -i, msginit option
+
  • -i, msgmerge option
+
  • -i, msgunfmt option
+
  • -i, msguniq option
+
  • -i, xgettext option
+
  • -j, msgfmt option
+
  • -J, msggrep option
+
  • -j, msgunfmt option
+
  • -j, xgettext option
+
  • -K, msggrep option
+
  • -k, xgettext option
+
  • -l, msgfmt option, -l, msgfmt option, -l, msgfmt option
+
  • -l, msginit option
+
  • -l, msgunfmt option, -l, msgunfmt option, -l, msgunfmt option
+
  • -L, xgettext option
+
  • -m, msgcmp option
+
  • -M, msggrep option
+
  • -m, msgmerge option
+
  • -M, xgettext option
+
  • -m, xgettext option
+
  • -n, gettext option
+
  • -n, msgattrib option
+
  • -n, msgcat option
+
  • -n, msgcomm option
+
  • -n, msgfilter option
+
  • -N, msggrep option
+
  • -N, msgmerge option
+
  • -n, msguniq option
+
  • -n, xgettext option
+
  • -o, msgattrib option
+
  • -o, msgcat option
+
  • -o, msgcomm option
+
  • -o, msgconv option
+
  • -o, msgen option
+
  • -o, msgfilter option
+
  • -o, msgfmt option
+
  • -o, msggrep option
+
  • -o, msginit option
+
  • -o, msgmerge option
+
  • -o, msgunfmt option
+
  • -o, msguniq option
+
  • -o, xgettext option
+
  • -p, msgattrib option
+
  • -P, msgattrib option
+
  • -p, msgcat option
+
  • -P, msgcat option
+
  • -P, msgcmp option
+
  • -p, msgcomm option
+
  • -P, msgcomm option
+
  • -p, msgconv option
+
  • -P, msgconv option
+
  • -p, msgen option
+
  • -P, msgen option
+
  • -P, msgexec option
+
  • -P, msgfilter option
+
  • -p, msgfilter option
+
  • -P, msgfmt option
+
  • -P, msggrep option
+
  • -p, msggrep option
+
  • -p, msginit option
+
  • -P, msginit option
+
  • -p, msgmerge option
+
  • -P, msgmerge option
+
  • -p, msgunfmt option
+
  • -p, msguniq option
+
  • -P, msguniq option
+
  • -p, xgettext option
+
  • -q, msgmerge option
+
  • -r, msgfmt option, -r, msgfmt option
+
  • -r, msgunfmt option, -r, msgunfmt option
+
  • -s, msgattrib option
+
  • -s, msgcat option
+
  • -s, msgcomm option
+
  • -s, msgconv option
+
  • -s, msgen option
+
  • -s, msgfilter option
+
  • -s, msgmerge option
+
  • -s, msgunfmt option
+
  • -s, msguniq option
+
  • -s, xgettext option
+
  • -t, msgcat option
+
  • -t, msgconv option
+
  • -T, msggrep option
+
  • -t, msguniq option
+
  • -T, xgettext option
+
  • -u, msgcat option
+
  • -u, msgcomm option
+
  • -U, msgmerge option
+
  • -u, msguniq option
+
  • -v, envsubst option
+
  • -V, envsubst option
+
  • -V, gettext option
+
  • -V, msgattrib option
+
  • -V, msgcat option
+
  • -V, msgcmp option
+
  • -V, msgcomm option
+
  • -V, msgconv option
+
  • -V, msgen option
+
  • -V, msgexec option
+
  • -V, msgfilter option
+
  • -v, msgfmt option
+
  • -V, msgfmt option
+
  • -V, msggrep option
+
  • -v, msggrep option
+
  • -V, msginit option
+
  • -V, msgmerge option
+
  • -v, msgmerge option
+
  • -v, msgunfmt option
+
  • -V, msgunfmt option
+
  • -V, msguniq option
+
  • -V, ngettext option
+
  • -V, xgettext option
+
  • -w, msgattrib option
+
  • -w, msgcat option
+
  • -w, msgcomm option
+
  • -w, msgconv option
+
  • -w, msgen option
+
  • -w, msgfilter option
+
  • -w, msggrep option
+
  • -w, msginit option
+
  • -w, msgmerge option
+
  • -w, msgunfmt option
+
  • -w, msguniq option
+
  • -w, xgettext option
+
  • -X, msggrep option
+
  • -x, xgettext option
 
    • 
 
 
    
diff --git a/gettext-tools/doc/gettext_22.html b/gettext-tools/doc/gettext_22.html
index 9e51665b8..6072fd999 100644
--- a/gettext-tools/doc/gettext_22.html
+++ b/gettext-tools/doc/gettext_22.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - Variable Index
@@ -11,7 +11,7 @@ Go to the first, previous
 
    
 
 
-
    Variable Index
    
+
    Variable Index
    
 
 
    
 Jump to:
@@ -21,35 +21,42 @@ Jump to:
 -
 m
 -
+p
+-
 t
 
    
 
    g
    
 
-
  • GETTEXT_LOG_UNTRANSLATED, environment variable
+
  • GETTEXT_LOG_UNTRANSLATED, environment variable
 
    • 
 
    l
    
 
-
  • LANG, environment variable, LANG, environment variable
-
  • LANGUAGE, environment variable, LANGUAGE, environment variable
-
  • LC_ALL, environment variable
-
  • LC_COLLATE, environment variable
-
  • LC_CTYPE, environment variable
-
  • LC_MESSAGES, environment variable
-
  • LC_MONETARY, environment variable
-
  • LC_NUMERIC, environment variable
-
  • LC_TIME, environment variable
-
  • LINGUAS, environment variable
+
  • LANG, environment variable, LANG, environment variable
+
  • LANGUAGE, environment variable, LANGUAGE, environment variable, LANGUAGE, environment variable
+
  • LC_ALL, environment variable, LC_ALL, environment variable
+
  • LC_COLLATE, environment variable, LC_COLLATE, environment variable
+
  • LC_CTYPE, environment variable, LC_CTYPE, environment variable
+
  • LC_MESSAGES, environment variable, LC_MESSAGES, environment variable
+
  • LC_MONETARY, environment variable, LC_MONETARY, environment variable
+
  • LC_NUMERIC, environment variable, LC_NUMERIC, environment variable
+
  • LC_TIME, environment variable, LC_TIME, environment variable
+
  • LINGUAS, environment variable
 
    • 
 
    m
    
 
-
  • MSGEXEC_LOCATION, environment variable
-
  • MSGEXEC_MSGCTXT, environment variable
-
  • MSGEXEC_MSGID, environment variable
+
  • MSGEXEC_LOCATION, environment variable
+
  • MSGEXEC_MSGCTXT, environment variable
+
  • MSGEXEC_MSGID, environment variable
+
    • 
+
    p
    
+
+
  • PO_STYLE, environment variable
 
    • 
 
    t
    
 
-
  • TEXTDOMAIN, environment variable
-
  • TEXTDOMAINDIR, environment variable
+
  • TERM, environment variable
+
  • TEXTDOMAIN, environment variable
+
  • TEXTDOMAINDIR, environment variable
 
    • 
 
 
    
diff --git a/gettext-tools/doc/gettext_23.html b/gettext-tools/doc/gettext_23.html
index be513f95c..032136c49 100644
--- a/gettext-tools/doc/gettext_23.html
+++ b/gettext-tools/doc/gettext_23.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - PO Mode Index
@@ -11,7 +11,7 @@ Go to the first, previous
 
    
 
 
-
    PO Mode Index
    
+
    PO Mode Index
    
 
 
    
 Jump to:
@@ -41,70 +41,70 @@ Jump to:
 
    
 
    &
    
 
-
  • ‘.emacs’ customizations
-
  • ‘TAGS’, and marking translatable strings
+
  • ‘.emacs’ customizations
+
  • ‘TAGS’, and marking translatable strings
 
    • 
 
    a
    
 
-
  • auxiliary PO file
+
  • auxiliary PO file
 
    • 
 
    c
    
 
-
  • commands
-
  • comment out PO file entry
-
  • consulting program sources
-
  • consulting translations to other languages
-
  • current entry of a PO file
-
  • cut and paste for translated strings
+
  • commands
+
  • comment out PO file entry
+
  • consulting program sources
+
  • consulting translations to other languages
+
  • current entry of a PO file
+
  • cut and paste for translated strings
 
    • 
 
    e
    
 
-
  • editing comments
-
  • editing multiple entries
-
  • editing translations
-
  • etags, using for marking strings
-
  • exiting PO subedit
+
  • editing comments
+
  • editing multiple entries
+
  • editing translations
+
  • etags, using for marking strings
+
  • exiting PO subedit
 
    • 
 
    f
    
 
-
  • find source fragment for a PO file entry
+
  • find source fragment for a PO file entry
 
    • 
 
    i
    
 
-
  • installing PO mode
+
  • installing PO mode
 
    • 
 
    l
    
 
-
  • looking at the source to aid translation
+
  • looking at the source to aid translation
 
    • 
 
    m
    
 
-
  • marking strings for translation
-
  • moving by fuzzy entries
-
  • moving by obsolete entries
-
  • moving by translated entries
-
  • moving by untranslated entries
-
  • moving through a PO file
+
  • marking strings for translation
+
  • moving by fuzzy entries
+
  • moving by obsolete entries
+
  • moving by translated entries
+
  • moving by untranslated entries
+
  • moving through a PO file
 
    • 
 
    o
    
 
-
  • obsolete active entry
+
  • obsolete active entry
 
    • 
 
    p
    
 
-
  • pending subedits
+
  • pending subedits
 
    • 
 
    s
    
 
-
  • starting a string translation
-
  • string normalization in entries
-
  • subedit minor mode
+
  • starting a string translation
+
  • string normalization in entries
+
  • subedit minor mode
 
    • 
 
    u
    
 
-
  • use the source, Luke
-
  • using obsolete translations to make new entries
-
  • using translation compendia
+
  • use the source, Luke
+
  • using obsolete translations to make new entries
+
  • using translation compendia
 
    • 
 
 
    
diff --git a/gettext-tools/doc/gettext_24.html b/gettext-tools/doc/gettext_24.html
index df7039477..d83fcd20c 100644
--- a/gettext-tools/doc/gettext_24.html
+++ b/gettext-tools/doc/gettext_24.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - Autoconf Macro Index
@@ -11,7 +11,7 @@ Go to the first, previous
 
    
 
 
-
    Autoconf Macro Index
    
+
    Autoconf Macro Index
    
 
 
    
 Jump to:
@@ -19,12 +19,13 @@ Jump to:
 
    
 
    a
    
 
-
  • AM_GNU_GETTEXT
-
  • AM_GNU_GETTEXT_INTL_SUBDIR
-
  • AM_GNU_GETTEXT_NEED
-
  • AM_GNU_GETTEXT_VERSION
-
  • AM_ICONV
-
  • AM_PO_SUBDIRS
+
  • AM_GNU_GETTEXT
+
  • AM_GNU_GETTEXT_INTL_SUBDIR
+
  • AM_GNU_GETTEXT_NEED
+
  • AM_GNU_GETTEXT_VERSION
+
  • AM_ICONV
+
  • AM_PO_SUBDIRS
+
  • AM_XGETTEXT_OPTION
 
    • 
 
 
    
diff --git a/gettext-tools/doc/gettext_25.html b/gettext-tools/doc/gettext_25.html
index 4de97f878..45aa7d5b5 100644
--- a/gettext-tools/doc/gettext_25.html
+++ b/gettext-tools/doc/gettext_25.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - General Index
@@ -11,7 +11,7 @@ Go to the first, previous
 
    
 
 
-
    General Index
    
+
    General Index
    
 
 
    
 Jump to:
@@ -71,428 +71,429 @@ Jump to:
 
    
 
    &
    
 
-
  • ‘ABOUT-NLS’ file
-
  • ‘acconfig.h’ file
-
  • ‘aclocal.m4’ file
-
  • ‘config.h.in’ file
-
  • ‘gettext.h’ file
-
  • ‘LINGUAS’ file
-
  • ‘Makefile.in.in’ extensions
-
  • ‘Makevars’ file
-
  • ‘mkinstalldirs’ file
-
  • ‘POTFILES.in’ file
+
  • ‘ABOUT-NLS’ file
+
  • ‘acconfig.h’ file
+
  • ‘aclocal.m4’ file
+
  • ‘config.h.in’ file
+
  • ‘gettext.h’ file
+
  • ‘LINGUAS’ file
+
  • ‘Makefile.in.in’ extensions
+
  • ‘Makevars’ file
+
  • ‘mkinstalldirs’ file
+
  • ‘POTFILES.in’ file
 
    • 
 
    _
    
 
-
  • _, a macro to mark strings for translation
-
  • _nl_msg_cat_cntr
+
  • _, a macro to mark strings for translation
+
  • _nl_msg_cat_cntr
 
    • 
 
    a
    
 
-
  • accumulating translations
-
  • adding keywords, xgettext
-
  • ambiguities
-
  • apply a filter to translations
-
  • apply command to all translations in a catalog
-
  • Arabic digits
-
  • attribute manipulation
-
  • attribute, fuzzy
-
  • attributes of a PO file entry
-
  • attributes, manipulating
-
  • autoconf macros for gettext
-
  • autopoint program, usage
-
  • auxiliary PO file
-
  • available translations
-
  • awk
+
  • accumulating translations
+
  • adding keywords, xgettext
+
  • ambiguities
+
  • apply a filter to translations
+
  • apply command to all translations in a catalog
+
  • Arabic digits
+
  • attribute manipulation
+
  • attribute, fuzzy
+
  • attributes of a PO file entry
+
  • attributes, manipulating
+
  • autoconf macros for gettext
+
  • autopoint program, usage
+
  • auxiliary PO file
+
  • available translations
+
  • awk
 
    • 
 
    b
    
 
-
  • backup old file, and msgmerge program
-
  • bash
-
  • bibliography
-
  • big picture
-
  • bind_textdomain_codeset
-
  • Boost format strings
+
  • backup old file, and msgmerge program
+
  • bash
+
  • bibliography
+
  • big picture
+
  • bind_textdomain_codeset
+
  • Boost format strings
 
  • bug report address
 
    • 
 
    c
    
 
-
  • C and C-like languages
-
  • C trigraphs
-
  • C#
-
  • C# mode, and msgfmt program
-
  • C# mode, and msgunfmt program
-
  • C# resources mode, and msgfmt program
-
  • C# resources mode, and msgunfmt program
-
  • C#, string concatenation
-
  • catalog encoding and msgexec output
-
  • catclose, a catgets function
-
  • catgets, X/Open specification
-
  • catgets, a catgets function
-
  • catopen, a catgets function
+
  • C and C-like languages
+
  • C trigraphs
+
  • C#
+
  • C# mode, and msgfmt program
+
  • C# mode, and msgunfmt program
+
  • C# resources mode, and msgfmt program
+
  • C# resources mode, and msgunfmt program
+
  • C#, string concatenation
+
  • catalog encoding and msgexec output
+
  • catclose, a catgets function
+
  • catgets, X/Open specification
+
  • catgets, a catgets function
+
  • catopen, a catgets function
 
  • character encoding
-
  • charset conversion at runtime
-
  • charset of PO files
-
  • check format strings
-
  • checking of translations
-
  • clisp
-
  • clisp C sources
+
  • charset conversion at runtime
+
  • charset of PO files
+
  • check format strings
+
  • checking of translations
+
  • clisp
+
  • clisp C sources
 
  • codeset
-
  • comments in PO files
-
  • comments, automatic
-
  • comments, extracted
-
  • comments, translator
-
  • Common Lisp
-
  • compare PO files
-
  • comparison of interfaces
-
  • compatibility with X/Open msgfmt
-
  • compendium
-
  • compendium, creating
-
  • concatenate PO files
-
  • concatenating PO files into a compendium
-
  • concatenation of strings
-
  • context
-
  • context, argument specification in xgettext
-
  • context, in MO files
-
  • context, in PO files
-
  • control characters
-
  • convert binary message catalog into PO file
-
  • convert translations to a different encoding
-
  • converting a package to use gettext
-
  • country codes
-
  • create new PO file
-
  • creating a new PO file
-
  • creating compendia
+
  • comments in PO files
+
  • comments, automatic
+
  • comments, extracted
+
  • comments, translator
+
  • Common Lisp
+
  • compare PO files
+
  • comparison of interfaces
+
  • compatibility with X/Open msgfmt
+
  • compendium
+
  • compendium, creating
+
  • concatenate PO files
+
  • concatenating PO files into a compendium
+
  • concatenation of strings
+
  • context
+
  • context, argument specification in xgettext
+
  • context, in MO files
+
  • context, in PO files
+
  • control characters
+
  • convert binary message catalog into PO file
+
  • convert translations to a different encoding
+
  • converting a package to use gettext
+
  • country codes
+
  • create new PO file
+
  • creating a new PO file
+
  • creating compendia
 
  • currency symbols
 
    • 
 
    d
    
 
 
  • date format
-
  • dcngettext
-
  • dcpgettext
-
  • dcpgettext_expr
-
  • debugging messages marked as format strings
-
  • dialect
-
  • disabling NLS
-
  • distribution tarball
-
  • dngettext
-
  • dollar substitution
-
  • domain ambiguities
-
  • dpgettext
-
  • dpgettext_expr
-
  • duplicate elimination
-
  • duplicate removal
+
  • dcngettext
+
  • dcpgettext
+
  • dcpgettext_expr
+
  • debugging messages marked as format strings
+
  • dialect
+
  • disabling NLS
+
  • distribution tarball
+
  • dngettext
+
  • dollar substitution
+
  • domain ambiguities
+
  • dpgettext
+
  • dpgettext_expr
+
  • duplicate elimination
+
  • duplicate removal
 
    • 
 
    e
    
 
-
  • editing comments in PO files
-
  • Editing PO Files
-
  • editing translations
-
  • Emacs Lisp
-
  • Emacs PO Mode
+
  • editing comments in PO files
+
  • Editing PO Files
+
  • editing translations
+
  • Emacs Lisp
+
  • Emacs PO Mode
 
  • encoding
-
  • encoding conversion
-
  • encoding conversion at runtime
-
  • encoding for your language
-
  • encoding list
-
  • encoding of PO files
-
  • environment variables
-
  • envsubst program, usage
-
  • eval_gettext function, usage
-
  • eval_ngettext function, usage
-
  • evolution of packages
-
  • extracting parts of a PO file into a compendium
+
  • encoding conversion
+
  • encoding conversion at runtime
+
  • encoding for your language
+
  • encoding list
+
  • encoding of PO files
+
  • environment variables
+
  • envsubst program, usage
+
  • eval_gettext function, usage
+
  • eval_ngettext function, usage
+
  • evolution of packages
+
  • extracting parts of a PO file into a compendium
 
    • 
 
    f
    
 
-
  • FDL, GNU Free Documentation License
-
  • file format, ‘.mo’
-
  • file format, ‘.po’
-
  • files, ‘.po’ and ‘.mo’
-
  • files, ‘.pot’
-
  • filter messages according to attributes
-
  • find common messages
-
  • force use of fuzzy entries
-
  • format strings
-
  • Free Pascal
-
  • function attribute, __format__
-
  • function attribute, __format_arg__
-
  • fuzzy entries
+
  • FDL, GNU Free Documentation License
+
  • file format, ‘.mo’
+
  • file format, ‘.po’
+
  • files, ‘.po’ and ‘.mo’
+
  • files, ‘.pot’
+
  • filter messages according to attributes
+
  • find common messages
+
  • force use of fuzzy entries
+
  • format strings
+
  • Free Pascal
+
  • function attribute, __format__
+
  • function attribute, __format_arg__
+
  • fuzzy entries
 
    • 
 
    g
    
 
-
  • gawk
-
  • GCC-source
-
  • generate binary message catalog from PO file
-
  • generate translation catalog in English
-
  • gettext files
-
  • gettext installation
-
  • gettext interface
-
  • gettext program, usage
-
  • gettext, a programmer's view
-
  • gettext vs catgets
-
  • gettextize program, usage
-
  • GNOME PO file editor
-
  • GPL, GNU General Public License
-
  • GUI programs
-
  • guile
+
  • gawk
+
  • GCC-source
+
  • generate binary message catalog from PO file
+
  • generate translation catalog in English
+
  • gettext files
+
  • gettext installation
+
  • gettext interface
+
  • gettext program, usage
+
  • gettext, a programmer's view
+
  • gettext vs catgets
+
  • gettextize program, usage
+
  • GNOME PO file editor
+
  • GPL, GNU General Public License
+
  • GUI programs
+
  • guile
 
    • 
 
    h
    
 
-
  • hash table, inside MO files
+
  • hash table, inside MO files
 
  • he, she, and they
-
  • header entry of a PO file
-
  • help option
-
  • history of GNU gettext
+
  • header entry of a PO file
+
  • help option
+
  • history of GNU gettext
 
    • 
 
    i
    
 
 
  • i18n
-
  • importing PO files
-
  • include file ‘libintl.h’, include file ‘libintl.h’, include file ‘libintl.h’, include file ‘libintl.h’
-
  • initialization
-
  • initialize new PO file
-
  • initialize translations from a compendium
-
  • installing gettext
-
  • interface to catgets
+
  • importing PO files
+
  • include file ‘libintl.h’, include file ‘libintl.h’, include file ‘libintl.h’, include file ‘libintl.h’
+
  • initialization
+
  • initialize new PO file
+
  • initialize translations from a compendium
+
  • installing gettext
+
  • interface to catgets
 
  • internationalization
-
  • inttypes.h
-
  • ISO 3166
-
  • ISO 639
+
  • inttypes.h
+
  • ISO 3166
+
  • ISO 639
 
    • 
 
    j
    
 
-
  • Java
-
  • Java mode, and msgfmt program
-
  • Java mode, and msgunfmt program
-
  • Java, string concatenation
+
  • Java
+
  • Java mode, and msgfmt program
+
  • Java mode, and msgunfmt program
+
  • Java, string concatenation
 
    • 
 
    k
    
 
-
  • KDE PO file editor
-
  • keyboard accelerator checking
+
  • KDE format strings
+
  • KDE PO file editor
+
  • keyboard accelerator checking
 
    • 
 
    l
    
 
 
  • l10n
-
  • language codes
-
  • language selection
-
  • language selection at runtime
-
  • large package
-
  • LGPL, GNU Lesser General Public License
-
  • libiconv library
-
  • libintl for C#
-
  • libintl for Java
-
  • libintl library
-
  • librep Lisp
-
  • License, GNU FDL
-
  • License, GNU GPL
-
  • License, GNU LGPL
-
  • Licenses
-
  • link with ‘libintl’
-
  • Linux, Linux, Linux
-
  • Lisp
-
  • list of translation teams, where to find
-
  • locale facet, LC_ALL
-
  • locale facet, LC_COLLATE
-
  • locale facet, LC_CTYPE, locale facet, LC_CTYPE, locale facet, LC_CTYPE
-
  • locale facet, LC_MESSAGES, locale facet, LC_MESSAGES
-
  • locale facet, LC_MONETARY, locale facet, LC_MONETARY
-
  • locale facet, LC_NUMERIC, locale facet, LC_NUMERIC
-
  • locale facet, LC_RESPONSES
-
  • locale facet, LC_TIME, locale facet, LC_TIME
-
  • locale facets
-
  • locale program
+
  • language codes
+
  • language selection
+
  • language selection at runtime
+
  • large package
+
  • LGPL, GNU Lesser General Public License
+
  • libiconv library
+
  • libintl for C#
+
  • libintl for Java
+
  • libintl library
+
  • librep Lisp
+
  • License, GNU FDL
+
  • License, GNU GPL
+
  • License, GNU LGPL
+
  • Licenses
+
  • link with ‘libintl’
+
  • Linux, Linux, Linux
+
  • Lisp
+
  • list of translation teams, where to find
+
  • locale categories, locale categories
+
  • locale category, LC_ALL
+
  • locale category, LC_COLLATE
+
  • locale category, LC_CTYPE, locale category, LC_CTYPE, locale category, LC_CTYPE
+
  • locale category, LC_MESSAGES, locale category, LC_MESSAGES
+
  • locale category, LC_MONETARY, locale category, LC_MONETARY
+
  • locale category, LC_NUMERIC, locale category, LC_NUMERIC
+
  • locale category, LC_RESPONSES
+
  • locale category, LC_TIME, locale category, LC_TIME
+
  • locale program
 
  • localization
-
  • lookup message translation, lookup message translation
-
  • lookup plural message translation, lookup plural message translation
+
  • lookup message translation, lookup message translation
+
  • lookup plural message translation, lookup plural message translation
 
    • 
 
    m
    
 
-
  • magic signature of MO files
-
  • manipulating PO files
-
  • marking Perl sources
-
  • marking string initializers
-
  • marking strings that require translation
-
  • marking strings, preparations
-
  • marking translatable strings
-
  • markup
-
  • menu entries
-
  • menu, keyboard accelerator support
-
  • merge PO files
-
  • merging two PO files
-
  • message catalog files location
+
  • magic signature of MO files
+
  • manipulating PO files
+
  • marking Perl sources
+
  • marking string initializers
+
  • marking strings that require translation
+
  • marking strings, preparations
+
  • marking translatable strings
+
  • markup
+
  • menu entries
+
  • menu, keyboard accelerator support
+
  • merge PO files
+
  • merging two PO files
+
  • message catalog files location
 
  • messages
-
  • migration from earlier versions of gettext
-
  • mnemonics of menu entries
-
  • MO file's format
-
  • modify message attributes
-
  • msgattrib program, usage
-
  • msgcat program, usage
-
  • msgcmp program, usage
-
  • msgcomm program, usage
-
  • msgconv program, usage
-
  • msgen program, usage
-
  • msgexec program, usage
-
  • msgfilter filter and catalog encoding
-
  • msgfilter program, usage
-
  • msgfmt program, usage
-
  • msggrep program, usage
-
  • msginit program, usage
-
  • msgmerge program, usage
-
  • msgunfmt program, usage
-
  • msguniq program, usage
-
  • multi-line strings
+
  • migration from earlier versions of gettext
+
  • mnemonics of menu entries
+
  • MO file's format
+
  • modify message attributes
+
  • msgattrib program, usage
+
  • msgcat program, usage
+
  • msgcmp program, usage
+
  • msgcomm program, usage
+
  • msgconv program, usage
+
  • msgen program, usage
+
  • msgexec program, usage
+
  • msgfilter filter and catalog encoding
+
  • msgfilter program, usage
+
  • msgfmt program, usage
+
  • msggrep program, usage
+
  • msginit program, usage
+
  • msgmerge program, usage
+
  • msgunfmt program, usage
+
  • msguniq program, usage
+
  • multi-line strings
 
    • 
 
    n
    
 
-
  • N_, a convenience macro
+
  • N_, a convenience macro
 
  • Native Language Support
 
  • Natural Language Support
-
  • newlines in PO files
-
  • ngettext
-
  • ngettext program, usage
+
  • newlines in PO files
+
  • ngettext
+
  • ngettext program, usage
 
  • NLS
 
  • number format
 
    • 
 
    o
    
 
-
  • Object Pascal
-
  • obsolete entries
-
  • optimization of gettext functions
-
  • orthography
-
  • outdigits
-
  • output to stdout, xgettext
-
  • overview of gettext
+
  • Object Pascal
+
  • obsolete entries
+
  • optimization of gettext functions
+
  • orthography
+
  • outdigits
+
  • output to stdout, xgettext
+
  • overview of gettext
 
    • 
 
    p
    
 
-
  • package and version declaration in ‘configure.in’
-
  • package build and installation options
-
  • package distributor's view of gettext
-
  • package installer's view of gettext
-
  • package maintainer's view of gettext
-
  • paragraphs
-
  • Pascal
-
  • Perl
-
  • Perl default keywords
-
  • Perl invalid string interpolation
-
  • Perl long lines
-
  • Perl parentheses
-
  • Perl pitfalls
-
  • Perl quote-like expressions
-
  • Perl special keywords for hash-lookups
-
  • Perl valid string interpolation
-
  • pgettext
-
  • pgettext_expr
-
  • PHP
-
  • Pike
-
  • plural form formulas
-
  • plural forms
-
  • plural forms, in MO files
-
  • plural forms, in PO files
-
  • PO files' format
-
  • PO mode (Emacs) commands
-
  • PO template file
-
  • po_file_domains
-
  • po_file_free
-
  • po_file_read
-
  • po_message_iterator
-
  • po_message_iterator_free
-
  • po_message_msgid
-
  • po_message_msgid_plural
-
  • po_message_msgstr
-
  • po_message_msgstr_plural
-
  • po_next_message
-
  • portability problems with sed
-
  • preparing programs for translation
-
  • preparing shell scripts for translation
-
  • problems with catgets interface
-
  • programming languages
-
  • Python
+
  • package and version declaration in ‘configure.ac’
+
  • package build and installation options
+
  • package distributor's view of gettext
+
  • package installer's view of gettext
+
  • package maintainer's view of gettext
+
  • paragraphs
+
  • Pascal
+
  • Perl
+
  • Perl default keywords
+
  • Perl invalid string interpolation
+
  • Perl long lines
+
  • Perl parentheses
+
  • Perl pitfalls
+
  • Perl quote-like expressions
+
  • Perl special keywords for hash-lookups
+
  • Perl valid string interpolation
+
  • pgettext
+
  • pgettext_expr
+
  • PHP
+
  • Pike
+
  • plural form formulas
+
  • plural forms
+
  • plural forms, in MO files
+
  • plural forms, in PO files
+
  • PO files' format
+
  • PO mode (Emacs) commands
+
  • PO template file
+
  • po_file_domains
+
  • po_file_free
+
  • po_file_read
+
  • po_message_iterator
+
  • po_message_iterator_free
+
  • po_message_msgid
+
  • po_message_msgid_plural
+
  • po_message_msgstr
+
  • po_message_msgstr_plural
+
  • po_next_message
+
  • portability problems with sed
+
  • preparing programs for translation
+
  • preparing shell scripts for translation
+
  • problems with catgets interface
+
  • programming languages
+
  • Python
 
    • 
 
    q
    
 
-
  • Qt format strings
-
  • Qt mode, and msgfmt program
-
  • quotation marks, quotation marks
-
  • quote characters, use in PO files
+
  • Qt format strings
+
  • Qt mode, and msgfmt program
+
  • quotation marks, quotation marks
+
  • quote characters, use in PO files
 
    • 
 
    r
    
 
-
  • recode-sr-latin program
-
  • related reading
-
  • release
-
  • RST
+
  • recode-sr-latin program
+
  • related reading
+
  • release
+
  • RST
 
    • 
 
    s
    
 
-
  • Scheme
-
  • scripting languages
-
  • search messages in a catalog
-
  • selecting message language
-
  • sentences
-
  • setting up gettext at build time
-
  • setting up gettext at run time
-
  • several domains
+
  • Scheme
+
  • scripting languages
+
  • search messages in a catalog
+
  • selecting message language
+
  • sentences
+
  • setting up gettext at build time
+
  • setting up gettext at run time
+
  • several domains
 
  • sex
 
  • she, he, and they
-
  • shell format string
-
  • shell scripts
-
  • Smalltalk
-
  • sorting msgcat output
-
  • sorting msgmerge output
-
  • sorting msgunfmt output
-
  • sorting output of xgettext
-
  • specifying plural form in a PO file
-
  • standard output, and msgcat
-
  • standard output, and msgmerge program
-
  • string concatenation
-
  • string normalization in entries
-
  • style
-
  • supported languages, xgettext
+
  • shell format string
+
  • shell scripts
+
  • Smalltalk
+
  • sorting msgcat output
+
  • sorting msgmerge output
+
  • sorting msgunfmt output
+
  • sorting output of xgettext
+
  • specifying plural form in a PO file
+
  • standard output, and msgcat
+
  • standard output, and msgmerge program
+
  • string concatenation
+
  • string normalization in entries
+
  • style
+
  • supported languages, xgettext
 
    • 
 
    t
    
 
-
  • Tcl
-
  • Tcl mode, and msgfmt program
-
  • Tcl mode, and msgunfmt program
-
  • template PO file
-
  • testing ‘.po’ files for equivalence
-
  • Tk's scripting language
-
  • translated entries
-
  • translating menu entries
+
  • Tcl
+
  • Tcl mode, and msgfmt program
+
  • Tcl mode, and msgunfmt program
+
  • template PO file
+
  • testing ‘.po’ files for equivalence
+
  • Tk's scripting language
+
  • translated entries
+
  • translating menu entries
 
  • translation aspects
-
  • Translation Matrix
+
  • Translation Matrix
 
  • Translation Project
-
  • turning off NLS support
-
  • tutorial of gettext usage
+
  • turning off NLS support
+
  • tutorial of gettext usage
 
    • 
 
    u
    
 
-
  • unify duplicate translations
-
  • untranslated entries
-
  • update translations from a compendium
-
  • upgrading to new versions of gettext
+
  • unify duplicate translations
+
  • untranslated entries
+
  • update translations from a compendium
+
  • upgrading to new versions of gettext
 
    • 
 
    v
    
 
-
  • version control for backup files, msgmerge
+
  • version control for backup files, msgmerge
 
    • 
 
    w
    
 
-
  • wxWidgets library
+
  • wxWidgets library
 
    • 
 
    x
    
 
-
  • xargs, and output from msgexec
-
  • xgettext program, usage
-
  • xmodmap program, and typing quotation marks
+
  • xargs, and output from msgexec
+
  • xgettext program, usage
+
  • xmodmap program, and typing quotation marks
 
    • 
 
    y
    
 
-
  • YaST2 scripting language
-
  • YCP
+
  • YaST2 scripting language
+
  • YCP
 
    • 
 
 
    
diff --git a/gettext-tools/doc/gettext_3.html b/gettext-tools/doc/gettext_3.html
index a3aa0532b..67a78ae84 100644
--- a/gettext-tools/doc/gettext_3.html
+++ b/gettext-tools/doc/gettext_3.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - 3  The Format of PO Files
@@ -11,10 +11,10 @@ Go to the first, previous<
 
    
 
 
-
    3  The Format of PO Files
    
+
    3  The Format of PO Files
    
 
    
-
-
+
+
 
 
    
 
    
@@ -63,9 +63,9 @@ msgstr "Error desconegut del sistema"
 
    • 
 
 
    
-
-
-
+
+
+
 Entries begin with some optional white space.  Usually, when generated
 through GNU gettext tools, there is exactly one blank line
 between entries.  Then comments follow, on lines all starting with the
@@ -90,8 +90,8 @@ All comments, of either kind, are optional.
 
 
    
 
    
-
-
+
+
 After white space and comments, entries show two strings, namely
 first the untranslated string as it appears in the original program
 sources, and then, the translation of this string.  The original
@@ -125,7 +125,7 @@ there are two forms of flags defined:
 
 
    fuzzy
 
    
-
+
 This flag can be generated by the msgmerge program or it can be
 inserted by the translator herself.  It shows that the msgstr
 string might not be a correct translation (anymore).  Only the translator
@@ -133,14 +133,14 @@ can judge if the translation requires further modification, or is
 acceptable as is.  Once satisfied with the translation, she then removes
 this fuzzy attribute.  The msgmerge program inserts this
 when it combined the msgid and msgstr entries after fuzzy
-search only.  See section 8.3.6  Fuzzy Entries.
+search only.  See section 8.3.6  Fuzzy Entries.
 
 
    c-format
 
    
-
+
 
    no-c-format
 
    
-
+
 These flags should not be added by a human.  Instead only the
 xgettext program adds them.  In an automated PO file processing
 system as proposed here the user changes would be thrown away again as
@@ -153,173 +153,181 @@ string happens to look like a C format string (with ‘%’
 
 In case the c-format flag is given for a string the msgfmt
 does some more tests to check to validity of the translation.
-See section 10.1  Invoking the msgfmt Program, section 4.6  Special Comments preceding Keywords and section 15.3.1  C Format Strings.
+See section 10.1  Invoking the msgfmt Program, section 4.6  Special Comments preceding Keywords and section 15.3.1  C Format Strings.
 
 
    objc-format
 
    
-
+
 
    no-objc-format
 
    
-
-Likewise for Objective C, see section 15.3.2  Objective C Format Strings.
+
+Likewise for Objective C, see section 15.3.2  Objective C Format Strings.
 
 
    sh-format
 
    
-
+
 
    no-sh-format
 
    
-
-Likewise for Shell, see section 15.3.3  Shell Format Strings.
+
+Likewise for Shell, see section 15.3.3  Shell Format Strings.
 
 
    python-format
 
    
-
+
 
    no-python-format
 
    
-
-Likewise for Python, see section 15.3.4  Python Format Strings.
+
+Likewise for Python, see section 15.3.4  Python Format Strings.
 
 
    lisp-format
 
    
-
+
 
    no-lisp-format
 
    
-
-Likewise for Lisp, see section 15.3.5  Lisp Format Strings.
+
+Likewise for Lisp, see section 15.3.5  Lisp Format Strings.
 
 
    elisp-format
 
    
-
+
 
    no-elisp-format
 
    
-
-Likewise for Emacs Lisp, see section 15.3.6  Emacs Lisp Format Strings.
+
+Likewise for Emacs Lisp, see section 15.3.6  Emacs Lisp Format Strings.
 
 
    librep-format
 
    
-
+
 
    no-librep-format
 
    
-
-Likewise for librep, see section 15.3.7  librep Format Strings.
+
+Likewise for librep, see section 15.3.7  librep Format Strings.
 
 
    scheme-format
 
    
-
+
 
    no-scheme-format
 
    
-
-Likewise for Scheme, see section 15.3.8  Scheme Format Strings.
+
+Likewise for Scheme, see section 15.3.8  Scheme Format Strings.
 
 
    smalltalk-format
 
    
-
+
 
    no-smalltalk-format
 
    
-
-Likewise for Smalltalk, see section 15.3.9  Smalltalk Format Strings.
+
+Likewise for Smalltalk, see section 15.3.9  Smalltalk Format Strings.
 
 
    java-format
 
    
-
+
 
    no-java-format
 
    
-
-Likewise for Java, see section 15.3.10  Java Format Strings.
+
+Likewise for Java, see section 15.3.10  Java Format Strings.
 
 
    csharp-format
 
    
-
+
 
    no-csharp-format
 
    
-
-Likewise for C#, see section 15.3.11  C# Format Strings.
+
+Likewise for C#, see section 15.3.11  C# Format Strings.
 
 
    awk-format
 
    
-
+
 
    no-awk-format
 
    
-
-Likewise for awk, see section 15.3.12  awk Format Strings.
+
+Likewise for awk, see section 15.3.12  awk Format Strings.
 
 
    object-pascal-format
 
    
-
+
 
    no-object-pascal-format
 
    
-
-Likewise for Object Pascal, see section 15.3.13  Object Pascal Format Strings.
+
+Likewise for Object Pascal, see section 15.3.13  Object Pascal Format Strings.
 
 
    ycp-format
 
    
-
+
 
    no-ycp-format
 
    
-
-Likewise for YCP, see section 15.3.14  YCP Format Strings.
+
+Likewise for YCP, see section 15.3.14  YCP Format Strings.
 
 
    tcl-format
 
    
-
+
 
    no-tcl-format
 
    
-
-Likewise for Tcl, see section 15.3.15  Tcl Format Strings.
+
+Likewise for Tcl, see section 15.3.15  Tcl Format Strings.
 
 
    perl-format
 
    
-
+
 
    no-perl-format
 
    
-
-Likewise for Perl, see section 15.3.16  Perl Format Strings.
+
+Likewise for Perl, see section 15.3.16  Perl Format Strings.
 
 
    perl-brace-format
 
    
-
+
 
    no-perl-brace-format
 
    
-
-Likewise for Perl brace, see section 15.3.16  Perl Format Strings.
+
+Likewise for Perl brace, see section 15.3.16  Perl Format Strings.
 
 
    php-format
 
    
-
+
 
    no-php-format
 
    
-
-Likewise for PHP, see section 15.3.17  PHP Format Strings.
+
+Likewise for PHP, see section 15.3.17  PHP Format Strings.
 
 
    gcc-internal-format
 
    
-
+
 
    no-gcc-internal-format
 
    
-
-Likewise for the GCC sources, see section 15.3.18  GCC internal Format Strings.
+
+Likewise for the GCC sources, see section 15.3.18  GCC internal Format Strings.
 
 
    qt-format
 
    
-
+
 
    no-qt-format
 
    
-
-Likewise for Qt, see section 15.3.19  Qt Format Strings.
+
+Likewise for Qt, see section 15.3.19  Qt Format Strings.
+
+
    kde-format
+
    
+
+
    no-kde-format
+
    
+
+Likewise for KDE, see section 15.3.20  KDE Format Strings.
 
 
    boost-format
 
    
-
+
 
    no-boost-format
 
    
-
-Likewise for Boost, see section 15.3.20  Boost Format Strings.
+
+Likewise for Boost, see section 15.3.21  Boost Format Strings.

    - - + + It is also possible to have entries with a context specifier. They look like this: @@ -347,8 +355,8 @@ and an absent msgctxt line do not mean the same thing.

    - - + + A different kind of entries is used for translations which involve plural forms. @@ -444,7 +452,7 @@ other character, we just did it this way because it is neater.

    - + One should carefully distinguish between end of lines marked as ‘\n’ inside quotes, which are part of the represented string, and end of lines in the PO file itself, outside string quotes, @@ -452,7 +460,7 @@ which have no incidence on the represented string.

    - + Outside strings, white lines and comments may be used freely. Comments start at the beginning of a line with ‘#’ and extend until the end of the PO file line. Comments written by translators diff --git a/gettext-tools/doc/gettext_4.html b/gettext-tools/doc/gettext_4.html index 523e659af..6a46a6868 100644 --- a/gettext-tools/doc/gettext_4.html +++ b/gettext-tools/doc/gettext_4.html @@ -1,7 +1,7 @@ + from gettext.texi on 4 November 2007 --> GNU gettext utilities - 4 Preparing Program Sources @@ -11,9 +11,9 @@ Go to the first, previous<

    -

    4 Preparing Program Sources

    +

    4 Preparing Program Sources

    - +

    @@ -30,17 +30,17 @@ needing translation. -

    4.1 Importing the gettext declaration

    +

    4.1 Importing the gettext declaration

    Presuming that your set of programs, or package, has been adjusted so all needed GNU gettext files are available, and your -‘Makefile’ files are adjusted (see section 13 The Maintainer's View), each C module +‘Makefile’ files are adjusted (see section 13 The Maintainer's View), each C module having translated C strings should contain the line:

    - + 

     #include <libintl.h>
@@ -59,10 +59,10 @@ the C string comes from a different C module) should contain the line:
 
 
 
-
    4.2  Triggering gettext Operations
    
+
    4.2  Triggering gettext Operations
    
 
 
    
-
+
 The initialization of locale data should be done with more or less
 the same code in every program, as demonstrated below:
 
@@ -87,11 +87,11 @@ or hello sources for more information.
 
 
    
 
    
-
-
+
+
 The use of LC_ALL might not be appropriate for you.
 LC_ALL includes all locale categories and especially
-LC_CTYPE.  This later category is responsible for determining
+LC_CTYPE.  This latter category is responsible for determining
 character classes with the isalnum etc. functions from
 ‘ctype.h’ which could especially for programs, which process some
 kind of input language, be wrong.  For example this would mean that a
@@ -101,8 +101,8 @@ France but not in the U.S.
 
    
 
    
 Some systems also have problems with parsing numbers using the
-scanf functions if an other but the LC_ALL locale is used.
-The standards say that additional formats but the one known in the
+scanf functions if an other but the LC_ALL locale category is
+used.  The standards say that additional formats but the one known in the
 "C" locale might be recognized.  But some systems seem to reject
 numbers in the "C" locale format.  In some situation, it might
 also be a problem with the notation itself which makes it impossible to
@@ -129,27 +129,31 @@ code above by a sequence of setlocale lines

    - - - - - - - + + + + + + + On all POSIX conformant systems the locale categories LC_CTYPE, LC_MESSAGES, LC_COLLATE, LC_MONETARY, LC_NUMERIC, and LC_TIME are available. On some systems which are only ISO C compliant, LC_MESSAGES is missing, but -a substitute for it is defined in GNU gettext's <libintl.h>. +a substitute for it is defined in GNU gettext's <libintl.h> and +in GNU gnulib's <locale.h>.

    Note that changing the LC_CTYPE also affects the functions -declared in the <ctype.h> standard header. If this is not +declared in the <ctype.h> standard header and some functions +declared in the <string.h> and <stdlib.h> standard headers. +If this is not desirable in your application (for example in a compiler's parser), you can use a set of substitute functions which hardwire the C locale, -such as found in the <c-ctype.h> and <c-ctype.c> files -in the gettext source distribution. +such as found in the modules ‘c-ctype’, ‘c-strcase’, +‘c-strcasestr’, ‘c-strtod’, ‘c-strtold’ in the GNU gnulib +source distribution.

    @@ -163,10 +167,10 @@ is not multithread-safe.

    -

    4.3 Preparing Translatable Strings

    +

    4.3 Preparing Translatable Strings

    - + Before strings can be marked for translations, they sometimes need to be adjusted. Usually preparing a string for translation is done right before marking it, during the marking phase which is described in the @@ -202,7 +206,7 @@ Let's look at some examples of these guidelines.

    - + Translatable strings should be in good English style. If slang language with abbreviations and shortcuts is used, often translators will not understand the message and will produce very inappropriate translations. @@ -231,13 +235,13 @@ of the objects"?

    - + In both cases, adding more words to the message will help both the translator and the English speaking user.

    - + Translatable strings should be entire sentences. It is often not possible to translate single verbs or adjectives in a substitutable way. @@ -323,7 +327,7 @@ combined by xgettext, so the translator has to handle them once only.)

    - + Translatable strings should be limited to one paragraph; don't let a single message be longer than ten lines. The reason is that when the translatable string changes, the translator is faced with the task of @@ -334,7 +338,7 @@ the entire message.

    - + Many GNU programs have a ‘--help’ output that extends over several screen pages. It is a courtesy towards the translators to split such a message into several ones of five to ten lines each. While doing that, @@ -345,8 +349,8 @@ looking for.

    - - + + Hardcoded string concatenation is sometimes used to construct English strings: @@ -373,7 +377,7 @@ sprintf (s, "Replace %s with %s?", object1, object2);

    - + A similar case is compile time concatenation of strings. The ISO C 99 include file <inttypes.h> contains a macro PRId64 that can be used as a formatting directive for outputting an ‘int64_t’ @@ -427,8 +431,8 @@ regardless whether in decimal, octal or hexadecimal.

    - - + + All this applies to other programming languages as well. For example, in Java and C#, string concatenation is very frequently used, because it is a compiler built-in operator. Like in C, in Java, you would change @@ -470,8 +474,8 @@ Console.WriteLine(

    - - + + Unusual markup or control characters should not be used in translatable strings. Translators will likely not understand the particular meaning of the markup or control characters. @@ -505,9 +509,9 @@ don't verify that the translations are well-formed HTML.

    -

    4.4 How Marks Appear in Sources

    +

    4.4 How Marks Appear in Sources

    - +

    @@ -533,7 +537,7 @@ return the proper translation, as far as possible or wanted, for the argument string. Most localizable strings are found in executable positions, that is, attached to variables or given as parameters to functions. But this is not universal usage, and some translatable -strings appear in structured initializations. See section 4.7 Special Cases of Translatable Strings. +strings appear in structured initializations. See section 4.7 Special Cases of Translatable Strings.

    @@ -558,7 +562,7 @@ sources for those trying to keep them within 79 or 80 columns.

    - + Many packages use ‘_’ (a simple underline) as a keyword, and write ‘_("Translatable string")’ instead of ‘gettext ("Translatable string")’. Further, the coding rule, from GNU standards, @@ -610,9 +614,9 @@ in English, it's customary to put a space before a colon.

    -

    4.5 Marking Translatable Strings

    +

    4.5 Marking Translatable Strings

    - +

    @@ -629,7 +633,7 @@ translation in some language, for the package being internationalized.

    - + The set of program sources, targeted by the PO mode commands describe here, should have an Emacs tags table constructed for your project, prior to using these PO file commands. This is easy to do. In any @@ -651,7 +655,7 @@ format Emacs can understand.

    - + For packages following the GNU coding standards, there is a make goal tags or TAGS which constructs the tag files in all directories and for all files containing source code. @@ -671,18 +675,18 @@ fill in while you mark strings as translatable in your program sources.

    ,
    - + Search through program sources for a string which looks like a candidate for translation (po-tags-search).
    M-,
    - + Mark the last string found with ‘_()’ (po-mark-translatable).
    M-.
    - + Mark the last string found with a keyword taken from a set of possible keywords. This command with a prefix allows some management of these keywords (po-select-mark-and-mark). @@ -690,7 +694,7 @@ keywords (po-select-mark-and-mark).

    - + The , (po-tags-search) command searches for the next occurrence of a string which looks like a possible candidate for translation, and displays the program source in another Emacs window, @@ -742,8 +746,8 @@ first tags file, this reinitialization might be considered spurious.

    - - + + The M-, (po-mark-translatable) command will mark the recently found string with the ‘_’ keyword. The M-. (po-select-mark-and-mark) command will request that you type @@ -801,10 +805,10 @@ prefer ‘_’, as this one is already built in the M-

    -

    4.6 Special Comments preceding Keywords

    +

    4.6 Special Comments preceding Keywords

    - + In C programs strings are often used within calls of functions from the printf family. The special thing about these format strings is that they can contain format specifiers introduced with %. Assume @@ -868,12 +872,12 @@ like a format specifier, but the string is not used in printf. Therefore the xgettext adds a special tag to those messages it thinks might be a format string. There is no absolute rule for this, only a heuristic. In the ‘.po’ file the entry is marked using the -c-format flag in the #, comment line (see section 3 The Format of PO Files). +c-format flag in the #, comment line (see section 3 The Format of PO Files).

    - - + + The careful reader now might say that this again can cause problems. The heuristic might guess it wrong. This is true and therefore xgettext knows about a special kind of comment which lets @@ -910,16 +914,16 @@ to use must contain the string xgettext:no-c-format.

    If a string is marked with c-format and this is not correct the user can find out who is responsible for the decision. See -section 5.1 Invoking the xgettext Program to see how the --debug option can be +section 5.1 Invoking the xgettext Program to see how the --debug option can be used for solving this problem.

    -

    4.7 Special Cases of Translatable Strings

    +

    4.7 Special Cases of Translatable Strings

    - + The attentive reader might now point out that it is not always possible to mark translatable string with gettext or something like this. Consider the following case: @@ -946,7 +950,7 @@ Consider the following case: While it is no problem to mark the string "a default message" it is not possible to mark the string initializers for messages. What is to be done? We have to fulfill two tasks. First we have to mark the -strings so that the xgettext program (see section 5.1 Invoking the xgettext Program) +strings so that the xgettext program (see section 5.1 Invoking the xgettext Program) can find them, and second we have to translate the string at runtime before printing them. @@ -979,7 +983,7 @@ from the array. So one solution can look like this:

    Please convince yourself that the string which is written by fputs is translated in any case. How to get xgettext know -the additional keyword gettext_noop is explained in section 5.1 Invoking the xgettext Program. +the additional keyword gettext_noop is explained in section 5.1 Invoking the xgettext Program.

    @@ -1021,7 +1025,69 @@ use this second method in this situation.

    -

    4.8 Marking Proper Names for Translation

    +

    4.8 Letting Users Report Translation Bugs

    + +

    +Code sometimes has bugs, but translations sometimes have bugs too. The +users need to be able to report them. Reporting translation bugs to the +programmer or maintainer of a package is not very useful, since the +maintainer must never change a translation, except on behalf of the +translator. Hence the translation bugs must be reported to the +translators. + +

    +

    +Here is a way to organize this so that the maintainer does not need to +forward translation bug reports, nor even keep a list of the addresses of +the translators or their translation teams. + +

    +

    +Every program has a place where is shows the bug report address. For +GNU programs, it is the code which handles the “--help” option, +typically in a function called “usage”. In this place, instruct the +translator to add her own bug reporting address. For example, if that +code has a statement + +

    + +
    +printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+
    + +

    +you can add some translator instructions like this: + +

    + +
    +/* TRANSLATORS: The placeholder indicates the bug-reporting address
+   for this package.  Please add _another line_ saying
+   "Report translation bugs to <...>\n" with the address for translation
+   bugs (typically your translation team's web or email address).  */
+printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+
    + +

    +These will be extracted by ‘xgettext’, leading to a .pot file that +contains this: + +

    + +
    +#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hello.c:178
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr ""
+
    + + + +

    4.9 Marking Proper Names for Translation

    Should names of persons, cities, locations etc. be marked for translation @@ -1103,7 +1169,7 @@ for translators using GNU Emacs or XEmacs with po-mode.

    -

    4.9 Preparing Library Sources

    +

    4.10 Preparing Library Sources

    When you are preparing a library, not a program, for the use of diff --git a/gettext-tools/doc/gettext_5.html b/gettext-tools/doc/gettext_5.html index 7a667760b..98af3313f 100644 --- a/gettext-tools/doc/gettext_5.html +++ b/gettext-tools/doc/gettext_5.html @@ -1,7 +1,7 @@ + from gettext.texi on 4 November 2007 --> GNU gettext utilities - 5 Making the PO Template File @@ -11,9 +11,9 @@ Go to the first, previous<

    -

    5 Making the PO Template File

    +

    5 Making the PO Template File

    - +

    @@ -33,11 +33,11 @@ was fuzzy, and the suffix ‘.pot’ wasn't in use at that -

    5.1 Invoking the xgettext Program

    +

    5.1 Invoking the xgettext Program

    - - + + 

     xgettext [option] [inputfile] ...
@@ -50,7 +50,7 @@ input files.
 
    
 
 
-
    5.1.1  Input file location
    
+
    5.1.1  Input file location
    
 
 
    
 
@@ -62,8 +62,8 @@ Input files.
 
    
 
    ‘--files-from=file’
 
    
-
-
+
+
 Read the names of the input files from file instead of getting
 them from the command line.
 
@@ -71,8 +71,8 @@ them from the command line.
 
    
 
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting ‘.po’
 file will be written relative to the current directory, though.
@@ -85,7 +85,7 @@ If inputfile is ‘-’, standard input is read.
 
    
 
 
-
    5.1.2  Output file location
    
+
    5.1.2  Output file location
    
 
 
    
 
@@ -93,16 +93,16 @@ If inputfile is ‘-’, standard input is read.
 
    
 
    ‘--default-domain=name’
 
    
-
-
+
+
 Use ‘name.po’ for output (instead of ‘messages.po’).
 
 
    ‘-o file’
 
    
 
    ‘--output=file’
 
    
-
-
+
+
 Write output to specified file (instead of ‘name.po’ or
 ‘messages.po’).
 
@@ -110,21 +110,21 @@ Write output to specified file (instead of ‘name.po’<
 
    
 
    ‘--output-dir=dir’
 
    
-
-
+
+
 Output files will be placed in directory dir.
 
 
    
 
 
    
-
+
 If the output file is ‘-’ or ‘/dev/stdout’, the output
 is written to standard output.
 
 
    
 
 
-
    5.1.3  Choice of input file language
    
+
    5.1.3  Choice of input file language
    
 
 
    
 
@@ -132,9 +132,9 @@ is written to standard output.
 
    
 
    ‘--language=name’
 
    
-
-
-
+
+
+
 Specifies the language of the input files.  The supported languages
 are C, C++, ObjectiveC, PO, Python,
 Lisp, EmacsLisp, librep, Scheme, Smalltalk,
@@ -146,8 +146,8 @@ are C, C++, ObjectiveC, PO,
 
    
 
    ‘--c++’
 
    
-
-
+
+
 This is a shorthand for --language=C++.
 
 
    
@@ -159,13 +159,13 @@ extension.
 
    
 
 
-
    5.1.4  Input file interpretation
    
+
    5.1.4  Input file interpretation
    
 
 
    
 
 
    ‘--from-code=name’
 
    
-
+
 Specifies the encoding of the input files.  This option is needed only
 if some untranslated message strings or their corresponding comments
 contain non-ASCII characters.  Note that Tcl and Glade input files are
@@ -179,7 +179,7 @@ By default the input files are assumed to be in ASCII.
 
    
 
 
-
    5.1.5  Operation mode
    
+
    5.1.5  Operation mode
    
 
 
    
 
@@ -187,16 +187,16 @@ By default the input files are assumed to be in ASCII.
 
    
 
    ‘--join-existing’
 
    
-
-
+
+
 Join messages with existing file.
 
 
    ‘-x file’
 
    
 
    ‘--exclude-file=file’
 
    
-
-
+
+
 Entries from file are not extracted.  file should be a PO or
 POT file.
 
@@ -204,8 +204,8 @@ POT file.
 
    
 
    ‘--add-comments[=tag]’
 
    
-
-
+
+
 Place comment block with tag (or those preceding keyword lines)
 in output file.
 
@@ -213,7 +213,7 @@ in output file.
 
 
 
-
    5.1.6  Language specific options
    
+
    5.1.6  Language specific options
    
 
 
    
 
@@ -221,8 +221,8 @@ in output file.
 
    
 
    ‘--extract-all’
 
    
-
-
+
+
 Extract all strings.
 
 This option has an effect with most languages, namely C, C++, ObjectiveC,
@@ -233,13 +233,13 @@ GCC-source, Glade.
 
    
 
    ‘--keyword[=keywordspec]’
 
    
-
-
+
+
 Additional keyword to be looked for (without keywordspec means not to
 use default keywords).
 
-
-
+
+
 If keywordspec is a C identifier id, xgettext looks
 for strings in the first argument of each call to the function or macro
 id.  If keywordspec is of the form
@@ -321,12 +321,14 @@ For Scheme: gettext, ngettext:1,2, gettext-noop<
 
  • 
 
 For Java: GettextResource.gettext:2,
-GettextResource.ngettext:2,3, gettext, ngettext:1,2,
-getString.
+GettextResource.ngettext:2,3, GettextResource.pgettext:2c,3,
+GettextResource.npgettext:2c,3,4, gettext, ngettext:1,2,
+pgettext:1c,2, npgettext:1c,2,3, getString.
 
 
  • 
 
-For C#: GetString, GetPluralString:1,2.
+For C#: GetString, GetPluralString:1,2,
+GetParticularString:1c,2, GetParticularPluralString:1c,2,3.
 
 
  • 
 
@@ -359,13 +361,13 @@ used.
 
 
    ‘--flag=word:arg:flag’
 
    
-
+
 Specifies additional flags for strings occurring as part of the argth
 argument of the function word.  The possible flags are the possible
 format string indicators, such as ‘c-format’, and their negations,
 such as ‘no-c-format’, possibly prefixed with ‘pass-’.
 
    
-
+
 The meaning of --flag=function:arg:lang-format
 is that in language lang, the specified function expects as
 argth argument a format string.  (For those of you familiar with
@@ -383,7 +385,7 @@ together with the checks done by ‘msgfmt -c’ it will en
 translators cannot accidentally use format string directives that would
 lead to a crash at runtime.
 
    
-
+
 The meaning of --flag=function:arg:pass-lang-format
 is that in language lang, if the function call occurs in a
 position that must yield a format string, then its argth argument
@@ -410,33 +412,41 @@ GCC-source.
 
    
 
    ‘--trigraphs’
 
    
-
-
-
+
+
+
 Understand ANSI C trigraphs for input.
 
    
 This option has an effect only with the languages C, C++, ObjectiveC.
 
 
    ‘--qt’
 
    
-
-
+
+
 Recognize Qt format strings.
 
    
 This option has an effect only with the language C++.
 
+
    ‘--kde’
+
    
+
+
+Recognize KDE 4 format strings.
+
    
+This option has an effect only with the language C++.
+
 
    ‘--boost’
 
    
-
-
+
+
 Recognize Boost format strings.
 
    
 This option has an effect only with the language C++.
 
 
    ‘--debug’
 
    
-
-
+
+
 Use the flags c-format and possible-c-format to show who was
 responsible for marking a message as a format string.  The latter form is
 used if the xgettext program decided, the format form is used if
@@ -455,53 +465,55 @@ adjacent strings, and escaped end of lines for continued strings.
 
    
 
 
-
    5.1.7  Output details
    
+
    5.1.7  Output details
    
 
 
    
 
 
    ‘--force-po’
 
    
-
+
 Always write an output file even if no message is defined.
 
 
    ‘-i’
 
    
 
    ‘--indent’
 
    
-
-
+
+
 Write the .po file using indented style.
 
 
    ‘--no-location’
 
    
-
-Do not write ‘#: filename:line’ lines.
+
+Do not write ‘#: filename:line’ lines.  Note that using
+this option makes it harder for technically skilled translators to understand
+each message's context.
 
 
    ‘-n’
 
    
 
    ‘--add-location’
 
    
-
-
+
+
 Generate ‘#: filename:line’ lines (default).
 
 
    ‘--strict’
 
    
-
+
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
 
 
    ‘--properties-output’
 
    
-
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
@@ -509,15 +521,15 @@ Note that this file format doesn't support plural forms.
 
    
 
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
 
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -526,9 +538,9 @@ lines which are wider than the output page width will be split.
 
    
 
    ‘--sort-output’
 
    
-
-
-
+
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -536,24 +548,27 @@ for the translator to understand each message's context.
 
    
 
    ‘--sort-by-file’
 
    
-
-
+
+
 Sort output by file location.
 
 
    ‘--omit-header’
 
    
-
+
 Don't write header with ‘msgid ""’ entry.
 
-
+
 This is useful for testing purposes because it eliminates a source
 of variance for generated .gmo files.  With --omit-header,
 two invocations of xgettext on the same files with the same
 options at different times are guaranteed to produce the same results.
 
+Note that using this option will lead to an error if the resulting file
+would not entirely be in ASCII.
+
 
    ‘--copyright-holder=string’
 
    
-
+
 Set the copyright holder in the output.  string should be the
 copyright holder of the surrounding package.  (Note that the msgstr
 strings, extracted from the package's sources, belong to the copyright
@@ -569,14 +584,25 @@ simply because xgettext was first used in the GNU project.
 
 
    ‘--foreign-user’
 
    
-
+
 Omit FSF copyright in output.  This option is equivalent to
 ‘--copyright-holder=”’.  It can be useful for packages outside the GNU
 project that want their translations to be in the public domain.
 
+
    ‘--package-name=package’
+
    
+
+Set the package name in the header of the output.
+
+
    ‘--package-version=version’
+
    
+
+Set the package version in the header of the output.  This option has an
+effect only if the ‘--package-name’ option is also used.
+
 
    ‘--msgid-bugs-address=email@address’
 
    
-
+
 Set the reporting address for msgid bugs.  This is the email address or URL
 to which the translators shall report bugs in the untranslated strings:
 
@@ -584,7 +610,7 @@ to which the translators shall report bugs in the untranslated strings:
 
      
 
    • Strings which are not entire sentences, see the maintainer guidelines
 
-in section 4.3  Preparing Translatable Strings.
+in section 4.3  Preparing Translatable Strings.
 
    • Strings which use unclear terms or require additional context to be
 
 understood.
@@ -610,23 +636,23 @@ Don't forget to specify this option.
 
      
 
      ‘--msgstr-prefix[=string]’
 
      
-
-
+
+
 Use string (or "" if not specified) as prefix for msgstr entries.
 
 
      ‘-M [string]’
 
      
 
      ‘--msgstr-suffix[=string]’
 
      
-
-
+
+
 Use string (or "" if not specified) as suffix for msgstr entries.
 
 
    
 
 
 
-
    5.1.8  Informative output
    
+
    5.1.8  Informative output
    
 
 
    
 
@@ -634,16 +660,16 @@ Use string (or "" if not specified) as suffix for msgstr entries.
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
diff --git a/gettext-tools/doc/gettext_6.html b/gettext-tools/doc/gettext_6.html
index 69fd38603..96b34c94c 100644
--- a/gettext-tools/doc/gettext_6.html
+++ b/gettext-tools/doc/gettext_6.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - 6  Creating a New PO File
@@ -11,9 +11,9 @@ Go to the first, previous<
 
    
 
 
-
    6  Creating a New PO File
    
+
    6  Creating a New PO File
    
 
    
-
+
 
 
    
 
    
@@ -45,26 +45,26 @@ the header entry of this file.
 
 
 
-
    6.1  Invoking the msginit Program
    
+
    6.1  Invoking the msginit Program
    
 
 
    
-
-
+
+
 
 
     msginit [option]
 
    
 
 
    
-
-
+
+
 The msginit program creates a new PO file, initializing the meta
 information with values from the user's environment.
 
 
    
 
 
-
    6.1.1  Input file location
    
+
    6.1.1  Input file location
    
 
 
    
 
@@ -72,8 +72,8 @@ information with values from the user's environment.
 
    
 
    ‘--input=inputfile’
 
    
-
-
+
+
 Input POT file.
 
 
    
@@ -85,7 +85,7 @@ POT file.  If it is ‘-’, standard input is read.
 
    
 
 
-
    6.1.2  Output file location
    
+
    6.1.2  Output file location
    
 
 
    
 
@@ -93,8 +93,8 @@ POT file.  If it is ‘-’, standard input is read.
 
    
 
    ‘--output-file=file’
 
    
-
-
+
+
 Write output to specified PO file.
 
 
    
@@ -107,7 +107,7 @@ standard output.
 
    
 
 
-
    6.1.3  Input file syntax
    
+
    6.1.3  Input file syntax
    
 
 
    
 
@@ -115,14 +115,14 @@ standard output.
 
    
 
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input file is a Java ResourceBundle in Java .properties
 syntax, not in PO file syntax.
 
 
    ‘--stringtable-input’
 
    
-
+
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 .strings syntax, not in PO file syntax.
 
@@ -130,7 +130,7 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
 
 
-
    6.1.4  Output details
    
+
    6.1.4  Output details
    
 
 
    
 
@@ -138,15 +138,15 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
    
 
    ‘--locale=ll_CC’
 
    
-
-
+
+
 Set target locale.  ll should be a language code, and CC should
 be a country code.  The command ‘locale -a’ can be used to output a list
 of all installed locales.  The default is the user's locale setting.
 
 
    ‘--no-translator’
 
    
-
+
 Declares that the PO file will not have a human translator and is instead
 automatically generated.
 
@@ -154,15 +154,15 @@ automatically generated.
 
    
 
    ‘--properties-output’
 
    
-
-
+
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
@@ -170,15 +170,15 @@ Note that this file format doesn't support plural forms.
 
    
 
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
 
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -187,7 +187,7 @@ lines which are wider than the output page width will be split.
 
 
 
-
    6.1.5  Informative output
    
+
    6.1.5  Informative output
    
 
 
    
 
@@ -195,25 +195,25 @@ lines which are wider than the output page width will be split.
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    6.2  Filling in the Header Entry
    
+
    6.2  Filling in the Header Entry
    
 
    
-
+
 
 
    
 
    
@@ -234,7 +234,8 @@ entry.  You should fill in the following fields.
 
 
    Project-Id-Version
 
    
-This is the name and version of the package.
+This is the name and version of the package.  Fill it in if it has not
+already been filled in by xgettext.
 
 
    Report-Msgid-Bugs-To
 
    
@@ -245,7 +246,7 @@ address or URL where you can report bugs in the untranslated strings:
 
      
 
    • Strings which are not entire sentences, see the maintainer guidelines
 
-in section 4.3  Preparing Translatable Strings.
+in section 4.3  Preparing Translatable Strings.
 
    • Strings which use unclear terms or require additional context to be
 
 understood.
@@ -282,22 +283,22 @@ Before starting a translation, it is a good idea to get in touch with
 your translation team, not only to make sure you don't do duplicated work,
 but also to coordinate difficult linguistic issues.
 
-
+
 In the Free Translation Project, each translation team has its own mailing
 list.  The up-to-date list of teams can be found at the Free Translation
-Project's homepage, http://www.iro.umontreal.ca/contrib/po/HTML/,
-in the "National teams" area.
+Project's homepage, http://translationproject.org/, in the "Teams"
+area.
 
 
      Content-Type
 
      
-
-
+
+
 Replace ‘CHARSET’ with the character encoding used for your language,
 in your locale, or UTF-8.  This field is needed for correct operation of the
 msgmerge and msgfmt programs, as well as for users whose
-locale's character encoding differs from yours (see section 11.2.4  How to specify the output character set gettext uses).
+locale's character encoding differs from yours (see section 11.2.4  How to specify the output character set gettext uses).
 
-
+
 You get the character encoding of your locale by running the shell command
 ‘locale charmap’.  If the result is ‘C’ or ‘ANSI_X3.4-1968’,
 which is equivalent to ‘ASCII’ (= ‘US-ASCII’), it means that your
@@ -305,7 +306,7 @@ locale is not correctly configured.  In this case, ask your translation
 team which charset to use.  ‘ASCII’ is not usable for any language
 except Latin.
 
-
+
 Because the PO files must be portable to operating systems with less advanced
 internationalization facilities, the character encodings that can be used
 are limited to those supported by both GNU libc and GNU
@@ -322,11 +323,11 @@ are limited to those supported by both GNU libc and GNU
 BIG5, BIG5-HKSCS, GBK, GB18030, SHIFT_JIS,
 JOHAB, TIS-620, VISCII, GEORGIAN-PS, UTF-8.
 
-
+
 In the GNU system, the following encodings are frequently used for the
 corresponding languages.
 
-
+
 
 
        
 
      • ISO-8859-1 for
@@ -386,8 +387,8 @@ for traditional writing of Chinese,
 
 
      
 
-
-
+
+
 When single quote characters or double quote characters are used in
 translations for your language, and your locale's encoding is one of the
 ISO-8859-* charsets, it is best if you create your PO files in UTF-8
@@ -399,7 +400,7 @@ real quote characters, whereas users in ISO-8859-* locales will see the
 vertical apostrophe and the vertical double quote instead (because that's
 what the character set conversion will transliterate them to).
 
-
+
 To enter such quote characters under X11, you can change your keyboard
 mapping using the xmodmap program.  The X11 names of the quote
 characters are "leftsinglequotemark", "rightsinglequotemark",
@@ -421,7 +422,7 @@ Set this to 8bit.
 
      
 This field is optional.  It is only needed if the PO file has plural forms.
 You can find them by searching for the ‘msgid_plural’ keyword.  The
-format of the plural forms field is described in section 11.2.6  Additional functions for plural forms.
+format of the plural forms field is described in section 11.2.6  Additional functions for plural forms.
 
    
 
 
    
diff --git a/gettext-tools/doc/gettext_7.html b/gettext-tools/doc/gettext_7.html
index 8c1194402..8c5dad4a1 100644
--- a/gettext-tools/doc/gettext_7.html
+++ b/gettext-tools/doc/gettext_7.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - 7  Updating Existing PO Files
@@ -11,15 +11,15 @@ Go to the first, previous<
 
    
 
 
-
    7  Updating Existing PO Files
    
+
    7  Updating Existing PO Files
    
 
 
 
-
    7.1  Invoking the msgmerge Program
    
+
    7.1  Invoking the msgmerge Program
    
 
 
    
-
-
+
+
 
 
     msgmerge [option] def.po ref.pot
@@ -40,7 +40,7 @@ is used to produce better results.
 
    
 
 
-
    7.1.1  Input file location
    
+
    7.1.1  Input file location
    
 
 
    
 
@@ -56,8 +56,8 @@ References to the new sources.
 
    
 
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting ‘.po’
 file will be written relative to the current directory, though.
@@ -66,16 +66,16 @@ file will be written relative to the current directory, though.
 
    
 
    ‘--compendium=file’
 
    
-
-
-Specify an additional library of message translations.  See section 8.3.14  Using Translation Compendia.
+
+
+Specify an additional library of message translations.  See section 8.4  Using Translation Compendia.
 This option may be specified more than once.
 
 
    
 
 
 
-
    7.1.2  Operation mode
    
+
    7.1.2  Operation mode
    
 
 
    
 
@@ -83,15 +83,15 @@ This option may be specified more than once.
 
    
 
    ‘--update’
 
    
-
-
+
+
 Update def.po.  Do nothing if def.po is already up to date.
 
 
    
 
 
 
-
    7.1.3  Output file location
    
+
    7.1.3  Output file location
    
 
 
    
 
@@ -99,21 +99,21 @@ Update def.po.  Do nothing if def.po is already up to date
 
    
 
    ‘--output-file=file’
 
    
-
-
+
+
 Write output to specified file.
 
 
    
 
 
    
-
+
 The results are written to standard output if no output file is specified
 or if it is ‘-’.
 
 
    
 
 
-
    7.1.4  Output file location in update mode
    
+
    7.1.4  Output file location in update mode
    
 
 
    
 The result is written back to def.po.
@@ -123,19 +123,19 @@ The result is written back to def.po.
 
 
    ‘--backup=control’
 
    
-
-
+
+
 Make a backup of def.po
 
 
    ‘--suffix=suffix’
 
    
-
+
 Override the usual backup suffix.
 
 
    
 
 
    
-
+
 The version control method may be selected via the --backup option
 or through the VERSION_CONTROL environment variable.  Here are the
 values:
@@ -177,7 +177,7 @@ The backup suffix is ‘~’, unless set with --suffi
 
    
 
 
-
    7.1.5  Operation modifiers
    
+
    7.1.5  Operation modifiers
    
 
 
    
 
@@ -185,29 +185,29 @@ The backup suffix is ‘~’, unless set with --suffi
 
    
 
    ‘--multi-domain’
 
    
-
-
+
+
 Apply ref.pot to each of the domains in def.po.
 
 
    ‘-N’
 
    
 
    ‘--no-fuzzy-matching’
 
    
-
-
+
+
 Do not use fuzzy matching when an exact match is not found.  This may speed
 up the operation considerably.
 
 
    ‘--previous’
 
    
-
+
 Keep the previous msgids of translated messages, marked with ‘#|’, when
 adding the fuzzy marker to such messages.
 
    
 
 
 
-
    7.1.6  Input file syntax
    
+
    7.1.6  Input file syntax
    
 
 
    
 
@@ -215,14 +215,14 @@ adding the fuzzy marker to such messages.
 
    
 
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input files are Java ResourceBundles in Java .properties
 syntax, not in PO file syntax.
 
 
    ‘--stringtable-input’
 
    
-
+
 Assume the input files are NeXTstep/GNUstep localized resource files in
 .strings syntax, not in PO file syntax.
 
@@ -230,36 +230,36 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 
 
 
-
    7.1.7  Output details
    
+
    7.1.7  Output details
    
 
 
    
 
 
    ‘--force-po’
 
    
-
+
 Always write an output file even if it contains no message.
 
 
    ‘-i’
 
    
 
    ‘--indent’
 
    
-
-
+
+
 Write the .po file using indented style.
 
 
    ‘--no-location’
 
    
-
+
 Do not write ‘#: filename:line’ lines.
 
 
    ‘--add-location’
 
    
-
+
 Generate ‘#: filename:line’ lines (default).
 
 
    ‘--strict’
 
    
-
+
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -268,15 +268,15 @@ GNU extensions.
 
    
 
    ‘--properties-output’
 
    
-
-
+
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
@@ -284,15 +284,15 @@ Note that this file format doesn't support plural forms.
 
    
 
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
 
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -301,9 +301,9 @@ lines which are wider than the output page width will be split.
 
    
 
    ‘--sort-output’
 
    
-
-
-
+
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -311,15 +311,15 @@ for the translator to understand each message's context.
 
    
 
    ‘--sort-by-file’
 
    
-
-
+
+
 Sort output by file location.
 
 
    
 
 
 
-
    7.1.8  Informative output
    
+
    7.1.8  Informative output
    
 
 
    
 
@@ -327,24 +327,24 @@ Sort output by file location.
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    ‘-v’
 
    
 
    ‘--verbose’
 
    
-
-
+
+
 Increase verbosity level.
 
 
    ‘-q’
@@ -353,9 +353,9 @@ Increase verbosity level.
 
    
 
    ‘--silent’
 
    
-
-
-
+
+
+
 Suppress progress indicators.
 
 
    
diff --git a/gettext-tools/doc/gettext_8.html b/gettext-tools/doc/gettext_8.html
index 1baa1bac5..09651a5ec 100644
--- a/gettext-tools/doc/gettext_8.html
+++ b/gettext-tools/doc/gettext_8.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - 8  Editing PO Files
@@ -11,31 +11,31 @@ Go to the first, previous<
 
    
 
 
-
    8  Editing PO Files
    
+
    8  Editing PO Files
    
 
    
-
+
 
 
    
 
 
 
-
    8.1  KDE's PO File Editor
    
+
    8.1  KDE's PO File Editor
    
 
    
-
+
 
 
    
 
 
-
    8.2  GNOME's PO File Editor
    
+
    8.2  GNOME's PO File Editor
    
 
    
-
+
 
 
    
 
 
-
    8.3  Emacs's PO File Editor
    
+
    8.3  Emacs's PO File Editor
    
 
    
-
+
 
 
    
 
@@ -53,19 +53,19 @@ with easy repositioning to PO file lines showing errors.
 
    
 
    
 For the beginning, besides main PO mode commands
-(see section 8.3.2  Main PO mode Commands), you should know how to move between entries
-(see section 8.3.3  Entry Positioning), and how to handle untranslated entries
-(see section 8.3.7  Untranslated Entries).
+(see section 8.3.2  Main PO mode Commands), you should know how to move between entries
+(see section 8.3.3  Entry Positioning), and how to handle untranslated entries
+(see section 8.3.7  Untranslated Entries).
 
 
    
 
 
 
-
    8.3.1  Completing GNU gettext Installation
    
+
    8.3.1  Completing GNU gettext Installation
    
 
 
    
-
-
+
+
 Once you have received, unpacked, configured and compiled the GNU
 gettext distribution, the ‘make install’ command puts in
 place the programs xgettext, msgfmt, gettext, and
@@ -75,8 +75,8 @@ PO mode available to your Emacs users.
 
 
    
 
    
-
-
+
+
 During the installation of the PO mode, you might want to modify your
 file ‘.emacs’, once and for all, so it contains a few lines looking
 like:
@@ -123,13 +123,13 @@ button 1).
 
    
 
 
-
    8.3.2  Main PO mode Commands
    
+
    8.3.2  Main PO mode Commands
    
 
 
    
-
-
+
+
 After setting up Emacs with something similar to the lines in
-section 8.3.1  Completing GNU gettext Installation, PO mode is activated for a window when Emacs finds a
+section 8.3.1  Completing GNU gettext Installation, PO mode is activated for a window when Emacs finds a
 PO file in that window.  This puts the window read-only and establishes a
 po-mode-map, which is a genuine Emacs mode, in a way that is not derived
 from text mode in any way.  Functions found on po-mode-hook,
@@ -141,9 +141,9 @@ When PO mode is active in a window, the letters ‘PO’ ap
 in the mode line for that window.  The mode line also displays how
 many entries of each kind are held in the PO file.  For example,
 the string ‘132t+3f+10u+2o’ would tell the translator that the
-PO mode contains 132 translated entries (see section 8.3.5  Translated Entries,
-3 fuzzy entries (see section 8.3.6  Fuzzy Entries), 10 untranslated entries
-(see section 8.3.7  Untranslated Entries) and 2 obsolete entries (see section 8.3.8  Obsolete Entries).  Zero-coefficients items are not shown.  So, in this example, if
+PO mode contains 132 translated entries (see section 8.3.5  Translated Entries,
+3 fuzzy entries (see section 8.3.6  Fuzzy Entries), 10 untranslated entries
+(see section 8.3.7  Untranslated Entries) and 2 obsolete entries (see section 8.3.8  Obsolete Entries).  Zero-coefficients items are not shown.  So, in this example, if
 the fuzzy entries were unfuzzied, the untranslated entries were translated
 and the obsolete entries were deleted, the mode line would merely display
 ‘145t’ for the counters.
@@ -159,47 +159,47 @@ in special ways.
 
 
    _
 
    
-
+
 Undo last modification to the PO file (po-undo).
 
 
    Q
 
    
-
+
 Quit processing and save the PO file (po-quit).
 
 
    q
 
    
-
+
 Quit processing, possibly after confirmation (po-confirm-and-quit).
 
 
    0
 
    
-
+
 Temporary leave the PO file window (po-other-window).
 
 
    ?
 
    
 
    h
 
    
-
-
+
+
 Show help about PO mode (po-help).
 
 
    =
 
    
-
+
 Give some PO file statistics (po-statistics).
 
 
    V
 
    
-
+
 Batch validate the format of the whole PO file (po-validate).
 
 
    
 
 
    
-
-
+
+
 The command _ (po-undo) interfaces to the Emacs
 undo facility.  See section ‘Undoing Changes’ in The Emacs Editor.  Each time U is typed, modifications which the translator
 did to the PO file are undone a little more.  For the purpose of
@@ -211,10 +211,10 @@ can undo the edition work quite parsimoniously.
 
 
    
 
    
-
-
-
-
+
+
+
+
 The commands Q (po-quit) and q
 (po-confirm-and-quit) are used when the translator is done with the
 PO file.  The former is a bit less verbose than the latter.  If the file
@@ -227,8 +227,8 @@ of an Emacs PO file buffer.  Merely killing it through the usual command
 
 
    
 
    
-
-
+
+
 The command 0 (po-other-window) is another, softer way,
 to leave PO mode, temporarily.  It just moves the cursor to some other
 Emacs window, and pops one if necessary.  For example, if the translator
@@ -242,9 +242,9 @@ PO mode is then recovered.
 
 
    
 
    
-
-
-
+
+
+
 The command h (po-help) displays a summary of all available PO
 mode commands.  The translator should then type any character to resume
 normal PO mode operations.  The command ? has the same effect
@@ -252,8 +252,8 @@ as h.
 
 
    
 
    
-
-
+
+
 The command = (po-statistics) computes the total number of
 entries in the PO file, the ordinal of the current entry (counted from
 1), the number of untranslated entries, the number of obsolete entries,
@@ -261,8 +261,8 @@ and displays all these numbers.
 
 
    
 
    
-
-
+
+
 The command V (po-validate) launches msgfmt in
 checking and verbose
 mode over the current PO file.  This command first offers to save the
@@ -273,7 +273,7 @@ as well as all individual entries.
 
 
    
 
    
-
+
 The program msgfmt runs asynchronously with Emacs, so the
 translator regains control immediately while her PO file is being studied.
 Error output is collected in the Emacs ‘*compilation*’ buffer,
@@ -286,10 +286,10 @@ any PO mode action which would help correcting the error.
 
    
 
 
-
    8.3.3  Entry Positioning
    
+
    8.3.3  Entry Positioning
    
 
 
    
-
+
 The cursor in a PO file window is almost always part of
 an entry.  The only exceptions are the special case when the cursor
 is after the last entry in the file, or when the PO file is
@@ -300,7 +300,7 @@ the PO file, this also selects on which entry commands operate.
 
 
    
 
    
-
+
 Some PO mode commands alter the position of the cursor in a specialized
 way.  A few of those special purpose positioning are described here,
 the others are described in following sections (for a complete list try
@@ -311,51 +311,51 @@ the others are described in following sections (for a complete list try
 
 
    .
 
    
-
+
 Redisplay the current entry (po-current-entry).
 
 
    n
 
    
-
+
 Select the entry after the current one (po-next-entry).
 
 
    p
 
    
-
+
 Select the entry before the current one (po-previous-entry).
 
 
    <
 
    
-
+
 Select the first entry in the PO file (po-first-entry).
 
 
    >
 
    
-
+
 Select the last entry in the PO file (po-last-entry).
 
 
    m
 
    
-
+
 Record the location of the current entry for later use
 (po-push-location).
 
 
    r
 
    
-
+
 Return to a previously saved entry location (po-pop-location).
 
 
    x
 
    
-
+
 Exchange the current entry location with the previously saved one
 (po-exchange-location).
 
 
    • 
 
 
    
-
-
+
+
 Any Emacs command able to reposition the cursor may be used
 to select the current entry in PO mode, including commands which
 move by characters, lines, paragraphs, screens or pages, and search
@@ -384,10 +384,10 @@ how others should do translation.
 
 
    
 
    
-
-
-
-
+
+
+
+
 The commands n (po-next-entry) and p
 (po-previous-entry) move the cursor the entry following,
 or preceding, the current one.  If n is given while the
@@ -396,10 +396,10 @@ is given while the cursor is on the first entry, no move is done.
 
 
    
 
    
-
-
-
-
+
+
+
+
 The commands < (po-first-entry) and >
 (po-last-entry) move the cursor to the first entry, or last
 entry, of the PO file.  When the cursor is located past the last
@@ -409,7 +409,7 @@ have the special property of being able to work even when the cursor
 is not into some PO file entry, and one may use them for nicely
 correcting this situation.  But even these commands will fail on a
 truly empty PO file.  There are development plans for the PO mode for it
-to interactively fill an empty PO file from sources.  See section 4.5  Marking Translatable Strings.
+to interactively fill an empty PO file from sources.  See section 4.5  Marking Translatable Strings.
 
 
    
 
    
@@ -422,10 +422,10 @@ register for getting back, or else, use the location ring.
 
 
    
 
    
-
-
-
-
+
+
+
+
 PO mode offers another approach, by which cursor locations may be saved
 onto a special stack.  The command m (po-push-location)
 merely adds the location of current entry to the stack, pushing
@@ -445,8 +445,8 @@ ought to use m immediately after r.
 
 
    
 
    
-
-
+
+
 The command x (po-exchange-location) simultaneously
 repositions the cursor to the entry associated with the top element of
 the stack of saved locations, and replaces that top element with the
@@ -459,9 +459,9 @@ merely use x for making the switch.
 
    
 
 
-
    8.3.4  Normalizing Strings in Entries
    
+
    8.3.4  Normalizing Strings in Entries
    
 
    
-
+
 
 
    
 
    
@@ -495,12 +495,12 @@ command is available:
 
 
    
 
    
-
+
 
    
 
 
    M-x po-normalize
 
    
-
+
 Tidy the whole PO file by making entries more uniform.
 
 
    
@@ -532,7 +532,7 @@ for continued lines.
 
 
    
 
    
-
+
 Having such an explicit normalizing command allows for importing PO
 files from other sources, but also eases the evolution of the current
 convention, evolution driven mostly by aesthetic concerns, as of now.
@@ -545,7 +545,7 @@ their PO files in nice ways.
 
 
    
 
    
-
+
 Right now, in PO mode, strings are single line or multi-line.  A string
 goes multi-line if and only if it has embedded newlines, that
 is, if it matches ‘[^\n]\n+[^\n]’.  So, we would have:
@@ -596,21 +596,21 @@ to be documented in this manual, once these questions settle.
 
    
 
 
-
    8.3.5  Translated Entries
    
+
    8.3.5  Translated Entries
    
 
    
-
+
 
 
    
 
    
 Each PO file entry for which the msgstr field has been filled with
-a translation, and which is not marked as fuzzy (see section 8.3.6  Fuzzy Entries),
+a translation, and which is not marked as fuzzy (see section 8.3.6  Fuzzy Entries),
 is said to be a translated entry.  Only translated entries will
 later be compiled by GNU msgfmt and become usable in programs.
 Other entry types will be excluded; translation will not occur for them.
 
 
    
 
    
-
+
 Some commands are more specifically related to translated entry processing.
 
 
    
@@ -618,21 +618,21 @@ Some commands are more specifically related to translated entry processing.
 
 
    t
 
    
-
+
 Find the next translated entry (po-next-translated-entry).
 
 
    T
 
    
-
+
 Find the previous translated entry (po-previous-translated-entry).
 
 
    
 
 
    
-
-
-
-
+
+
+
+
 The commands t (po-next-translated-entry) and T
 (po-previous-translated-entry) move forwards or backwards, chasing
 for an translated entry.  If none is found, the search is extended and
@@ -640,25 +640,25 @@ wraps around in the PO file buffer.
 
 
    
 
    
-
+
 Translated entries usually result from the translator having edited in
-a translation for them, section 8.3.9  Modifying Translations.  However, if the
+a translation for them, section 8.3.9  Modifying Translations.  However, if the
 variable po-auto-fuzzy-on-edit is not nil, the entry having
 received a new translation first becomes a fuzzy entry, which ought to
 be later unfuzzied before becoming an official, genuine translated entry.
-See section 8.3.6  Fuzzy Entries.
+See section 8.3.6  Fuzzy Entries.
 
 
    
 
 
-
    8.3.6  Fuzzy Entries
    
+
    8.3.6  Fuzzy Entries
    
 
    
-
+
 
 
    
 
    
-
-
+
+
 Each PO file entry may have a set of attributes, which are
 qualities given a name and explicitly associated with the translation,
 using a special system comment.  One of these attributes
@@ -681,7 +681,7 @@ might mark some entries as being fuzzy.
 
 
    
 
    
-
+
 Also, the translator may decide herself to mark an entry as fuzzy
 for her own convenience, when she wants to remember that the entry
 has to be later revisited.  So, some commands are more specifically
@@ -692,26 +692,26 @@ related to fuzzy entry processing.
 
 
    z
 
    
-
+
 Find the next fuzzy entry (po-next-fuzzy-entry).
 
 
    Z
 
    
-
+
 Find the previous fuzzy entry (po-previous-fuzzy-entry).
 
 
    TAB
 
    
-
+
 Remove the fuzzy attribute of the current entry (po-unfuzzy).
 
 
    
 
 
    
-
-
-
-
+
+
+
+
 The commands z (po-next-fuzzy-entry) and Z
 (po-previous-fuzzy-entry) move forwards or backwards, chasing for
 a fuzzy entry.  If none is found, the search is extended and wraps
@@ -719,9 +719,9 @@ around in the PO file buffer.
 
 
    
 
    
-
-
-
+
+
+
 The command TAB (po-unfuzzy) removes the fuzzy
 attribute associated with an entry, usually leaving it translated.
 Further, if the variable po-auto-select-on-unfuzzy has not
@@ -743,8 +743,8 @@ to chase another entry, leaving the entry fuzzy.
 
 
    
 
    
-
-
+
+
 The translator may also use the DEL command
 (po-fade-out-entry) over any translated entry to mark it as being
 fuzzy, when she wants to easily leave a trace she wants to later return
@@ -759,9 +759,9 @@ still exists.
 
    
 
 
-
    8.3.7  Untranslated Entries
    
+
    8.3.7  Untranslated Entries
    
 
    
-
+
 
 
    
 
    
@@ -781,7 +781,7 @@ are easily recognizable by the fact they end with ‘msgstr ""’<
 
 
    
 
    
-
+
 The work of the translator might be (quite naively) seen as the process
 of seeking for an untranslated entry, editing a translation for
 it, and repeating these actions until no untranslated entries remain.
@@ -793,26 +793,26 @@ processing.
 
 
    u
 
    
-
+
 Find the next untranslated entry (po-next-untranslated-entry).
 
 
    U
 
    
-
+
 Find the previous untranslated entry (po-previous-untransted-entry).
 
 
    k
 
    
-
+
 Turn the current entry into an untranslated one (po-kill-msgstr).
 
 
    
 
 
    
-
-
-
-
+
+
+
+
 The commands u (po-next-untranslated-entry) and U
 (po-previous-untransted-entry) move forwards or backwards,
 chasing for an untranslated entry.  If none is found, the search is
@@ -820,11 +820,11 @@ extended and wraps around in the PO file buffer.
 
 
    
 
    
-
-
+
+
 An entry can be turned back into an untranslated entry by
 merely emptying its translation, using the command k
-(po-kill-msgstr).  See section 8.3.9  Modifying Translations.
+(po-kill-msgstr).  See section 8.3.9  Modifying Translations.
 
 
    
 
    
@@ -835,9 +835,9 @@ if some untranslated string still exists.
 
    
 
 
-
    8.3.8  Obsolete Entries
    
+
    8.3.8  Obsolete Entries
    
 
    
-
+
 
 
    
 
    
@@ -863,7 +863,7 @@ after the fact.
 
 
    
 
    
-
+
 Moreover, some commands are more specifically related to obsolete
 entry processing.
 
@@ -872,27 +872,27 @@ entry processing.
 
 
    o
 
    
-
+
 Find the next obsolete entry (po-next-obsolete-entry).
 
 
    O
 
    
-
+
 Find the previous obsolete entry (po-previous-obsolete-entry).
 
 
    DEL
 
    
-
+
 Make an active entry obsolete, or zap out an obsolete entry
 (po-fade-out-entry).

    - - - - + + + + The commands o (po-next-obsolete-entry) and O (po-previous-obsolete-entry) move forwards or backwards, chasing for an obsolete entry. If none is found, the search is @@ -908,10 +908,10 @@ introducing useless msgid values.

    - - - - + + + + However, it is possible to comment out an active entry, so making it obsolete. GNU gettext utilities will later react to the disappearance of a translation by using the untranslated string. @@ -921,7 +921,7 @@ translated entry), then it is first made fuzzy. If it is already fuzzy, then the entry is merely commented out, with confirmation. If the entry is already obsolete, then it is completely deleted from the PO file. It is easy to recycle the translation so deleted into some other PO file -entry, usually one which is untranslated. See section 8.3.9 Modifying Translations. +entry, usually one which is untranslated. See section 8.3.9 Modifying Translations.

    @@ -939,10 +939,10 @@ merely tries to provide handy tools for helping her to do so.

    -

    8.3.9 Modifying Translations

    +

    8.3.9 Modifying Translations

    - - + +

    @@ -968,40 +968,40 @@ using the following commands for modifying the translations.

    RET
    - + Interactively edit the translation (po-edit-msgstr).
    LFD
    C-j
    - - + + Reinitialize the translation with the original, untranslated string (po-msgid-to-msgstr).
    k
    - + Save the translation on the kill ring, and delete it (po-kill-msgstr).
    w
    - + Save the translation on the kill ring, without deleting it (po-kill-ring-save-msgstr).
    y
    - + Replace the translation, taking the new from the kill ring (po-yank-msgstr).

    - - + + The command RET (po-edit-msgstr) opens a new Emacs window meant to edit in a new translation, or to modify an already existing translation. The new window contains a copy of the translation taken from @@ -1009,14 +1009,14 @@ the current PO file entry, all ready for edition, expunged of all quoting marks, fully modifiable and with the complete extent of Emacs modifying commands. When the translator is done with her modifications, she may use C-c C-c to close the subedit window with the automatically requoted -results, or C-c C-k to abort her modifications. See section 8.3.11 Details of Sub Edition, +results, or C-c C-k to abort her modifications. See section 8.3.11 Details of Sub Edition, for more information.

    - - - + + + The command LFD (po-msgid-to-msgstr) initializes, or reinitializes the translation with the original string. This command is normally used when the translator wants to redo a fresh translation of @@ -1024,7 +1024,7 @@ the original string, disregarding any previous work.

    - + It is possible to arrange so, whenever editing an untranslated entry, the LFD command be automatically executed. If you set po-auto-edit-with-msgid to t, the translation gets @@ -1033,7 +1033,7 @@ The default value for po-auto-edit-with-msgid is nil.

    - + In fact, whether it is best to start a translation with an empty string, or rather with a copy of the original string, is a matter of taste or habit. Sometimes, the source language and the @@ -1047,11 +1047,11 @@ if this requires some extra editing work to get rid of the original.

    - - - - - + + + + + The command k (po-kill-msgstr) merely empties the translation string, so turning the entry into an untranslated one. But while doing so, its previous contents is put apart in @@ -1083,8 +1083,8 @@ entries, the translation is also uncommented prior to saving.

    - - + + The command y (po-yank-msgstr) completely replaces the translation of the current entry by a string taken from the kill ring. Following Emacs terminology, we then say that the replacement @@ -1118,7 +1118,7 @@ yanking commands themselves.

    - + To better illustrate the operation of killing and yanking, let's use an actual example, taken from a common situation. When the programmer slightly modifies some string right in the program, his @@ -1156,10 +1156,10 @@ See section ‘Keyboard Macros’ in The Emacs Editor.

    -

    8.3.10 Modifying Comments

    +

    8.3.10 Modifying Comments

    - - + +

    @@ -1176,36 +1176,36 @@ Comments not having whitespace after the initial ‘#’, f those beginning with ‘#.’ or ‘#:’, are not translator comments, they are exclusively created by other gettext tools. So, the commands below will never alter such system added comments, -they are not meant for the translator to modify. See section 3 The Format of PO Files. +they are not meant for the translator to modify. See section 3 The Format of PO Files.

    The following commands are somewhat similar to those modifying translations, -so the general indications given for those apply here. See section 8.3.9 Modifying Translations. +so the general indications given for those apply here. See section 8.3.9 Modifying Translations.

    #
    - + Interactively edit the translator comments (po-edit-comment).
    K
    - + Save the translator comments on the kill ring, and delete it (po-kill-comment).
    W
    - + Save the translator comments on the kill ring, without deleting it (po-kill-ring-save-comment).
    Y
    - + Replace the translator comments, taking the new from the kill ring (po-yank-comment). @@ -1217,12 +1217,12 @@ strings, and behave much the same way as they do, except that they handle this part of PO file comments meant for translator usage, rather than the translation strings. So, if the descriptions given below are slightly succinct, it is because the full details have already been given. -See section 8.3.9 Modifying Translations. +See section 8.3.9 Modifying Translations.

    - - + + The command # (po-edit-comment) opens a new Emacs window containing a copy of the translator comments on the current PO file entry. If there are no such comments, PO mode understands that the translator wants @@ -1232,22 +1232,22 @@ removed before edition, and reinstated after. For translator comments pertaining to obsolete entries, the uncommenting and recommenting operations are done twice. Once in the editing window, the keys C-c C-c allow the translator to tell she is finished with editing the comment. -See section 8.3.11 Details of Sub Edition, for further details. +See section 8.3.11 Details of Sub Edition, for further details.

    - + Functions found on po-subedit-mode-hook, if any, are executed after the string has been inserted in the edit buffer.

    - - - - - - + + + + + + The command K (po-kill-comment) gets rid of all translator comments, while saving those comments on the kill ring. The command W (po-kill-ring-save-comment) takes @@ -1286,9 +1286,9 @@ regular Emacs commands C-y (yank) and M-y

    -

    8.3.11 Details of Sub Edition

    +

    8.3.11 Details of Sub Edition

    - +

    @@ -1301,25 +1301,25 @@ of Emacs, which are described below.

    C-c C-c
    - + Complete edition (po-subedit-exit).
    C-c C-k
    - + Abort edition (po-subedit-abort).
    C-c C-a
    - + Consult auxiliary PO files (po-subedit-cycle-auxiliary).

    - - - + + + The window's contents represents a translation for a given message, or a translator comment. The translator may modify this window to her heart's content. Once this is done, the command C-c C-c @@ -1329,8 +1329,8 @@ sight or if buffers were switched.

    - - + + If the translator becomes unsatisfied with her translation or comment, to the extent she prefers keeping what was existent prior to the RET or # command, she may use the command C-c C-k @@ -1341,14 +1341,14 @@ whole effect of last edition.

    - - + + The command C-c C-a (po-subedit-cycle-auxiliary) allows for glancing through translations already achieved in other languages, directly while editing the current translation. This may be quite convenient when the translator is fluent at many languages, but of course, only makes sense when such completed -auxiliary PO files are already available to her (see section 8.3.13 Consulting Auxiliary PO Files). +auxiliary PO files are already available to her (see section 8.3.13 Consulting Auxiliary PO Files).

    @@ -1376,7 +1376,7 @@ in the editing window, as ending with two < in a row.

    - + When a translation (or a comment) is being edited, the translator may move the cursor back into the PO file buffer and freely move to other entries, browsing at will. If, with an edition pending, the translator wanders in the @@ -1389,7 +1389,7 @@ the translator should better be comfortable at handling many Emacs windows!

    - + Pending subedits may be completed or aborted in any order, regardless of how or when they were started. When many subedits are pending and the translator asks for quitting the PO file (with the q command), subedits @@ -1398,11 +1398,11 @@ are automatically resumed one at a time, so she may decide for each of them.

    -

    8.3.12 C Sources Context

    +

    8.3.12 C Sources Context

    - - - + + +

    @@ -1439,7 +1439,7 @@ overall organization, than to the program code itself.

    - + The following commands are meant to help the translator at getting program source context for a PO file entry. @@ -1448,35 +1448,35 @@ program source context for a PO file entry.

    s
    - + Resume the display of a program source context, or cycle through them (po-cycle-source-reference).
    M-s
    - + Display of a program source context selected by menu (po-select-source-reference).
    S
    - + Add a directory to the search path for source files (po-consider-source-path).
    M-S
    - + Delete a directory from the search path for source files (po-ignore-source-path).

    - - - - + + + + The commands s (po-cycle-source-reference) and M-s (po-select-source-reference) both open another window displaying some source program file, and already positioned in such a way that @@ -1521,10 +1521,10 @@ available for a single string to translate.

    - - - - + + + + Program source files are usually found relative to where the PO file stands. As a special provision, when this fails, the file is also looked for, but relative to the directory immediately above it. @@ -1542,9 +1542,9 @@ one of the directories she does not want anymore on the search path.

    -

    8.3.13 Consulting Auxiliary PO Files

    +

    8.3.13 Consulting Auxiliary PO Files

    - +

    @@ -1557,8 +1557,8 @@ at once, for translators preferring to work in this way.

    - - + + An auxiliary PO file is an existing PO file meant for the same package the translator is working on, but targeted to a different mother tongue language. Commands exist for declaring and handling auxiliary @@ -1573,41 +1573,41 @@ Here are the auxiliary file commands available in PO mode.

    a
    - + Seek auxiliary files for another translation for the same entry (po-cycle-auxiliary).
    C-c C-a
    - + Switch to a particular auxiliary file (po-select-auxiliary).
    A
    - + Declare this PO file as an auxiliary file (po-consider-as-auxiliary).
    M-A
    - + Remove this PO file from the list of auxiliary files (po-ignore-as-auxiliary).

    - - - - + + + + Command A (po-consider-as-auxiliary) adds the current PO file to the list of auxiliary files, while command M-A (po-ignore-as-auxiliary just removes it.

    - - + + The command a (po-cycle-auxiliary) seeks all auxiliary PO files, round-robin, searching for a translated entry in some other language having an msgid field identical as the one for the current entry. @@ -1619,8 +1619,8 @@ so repeating a will eventually yield back the original PO file.

    - - + + The command C-c C-a (po-select-auxiliary) asks the translator for her choice of a particular auxiliary file, with completion, and then switches to that selected PO file. The command also checks if @@ -1640,7 +1640,7 @@ their msgid entries written by the same GNU gettext to

    - + However, PO files initially created by PO mode itself, while marking strings in source files, are normalised differently. So are PO files resulting of the ‘M-x normalize’ command. Until these @@ -1650,13 +1650,13 @@ fully resolved, the translator should stay aware of normalisation issues.

    -

    8.3.14 Using Translation Compendia

    +

    8.4 Using Translation Compendia

    - +

    - + A compendium is a special PO file containing a set of translations recurring in many different packages. The translator can use gettext tools to build a new compendium, to add entries to her @@ -1667,10 +1667,10 @@ already translated entries, from translations kept in the compendium. -

    8.3.14.1 Creating Compendia

    +

    8.4.1 Creating Compendia

    - - + +

    @@ -1682,11 +1682,11 @@ files and extracting a message subset from a PO file.

    -

    8.3.14.2 Concatenate PO Files

    +

    8.4.1.1 Concatenate PO Files

    - - + + To concatenate several valid PO files into one compendium file you can use ‘msgcomm’ or ‘msgcat’ (the latter preferred): @@ -1765,9 +1765,9 @@ files or postprocess the result using ‘msgattrib --translated --no-f

    -

    8.3.14.3 Extract a Message Subset from a PO File

    +

    8.4.1.2 Extract a Message Subset from a PO File

    - +

    @@ -1787,7 +1787,7 @@ msggrep --location src/getopt.c -o compendium.po file.po -

    8.3.14.4 Using Compendia

    +

    8.4.2 Using Compendia

    You can use a compendium file to initialize a translation from scratch @@ -1796,9 +1796,9 @@ or to update an already existing translation.

    -

    8.3.14.5 Initialize a New Translation File

    +

    8.4.2.1 Initialize a New Translation File

    - +

    @@ -1813,9 +1813,9 @@ msgmerge --compendium compendium.po -o file.po /dev/null file.pot -

    8.3.14.6 Update an Existing Translation File

    +

    8.4.2.2 Update an Existing Translation File

    - +

    @@ -1827,7 +1827,7 @@ here done using ‘sed’): 

     msgcat --use-first -o update.po compendium1.po compendium2.po file.po
-msgmerge update.po file.pot | sed -e '/^#~/d' > file.po
+msgmerge update.po file.pot | msgattrib --no-obsolete > file.po

    diff --git a/gettext-tools/doc/gettext_9.html b/gettext-tools/doc/gettext_9.html index c2b9777cd..61fcd4978 100644 --- a/gettext-tools/doc/gettext_9.html +++ b/gettext-tools/doc/gettext_9.html @@ -1,7 +1,7 @@ + from gettext.texi on 4 November 2007 --> GNU gettext utilities - 9 Manipulating PO Files @@ -11,9 +11,9 @@ Go to the first, previous<

    -

    9 Manipulating PO Files

    +

    9 Manipulating PO Files

    - +

    @@ -23,7 +23,7 @@ complete set of tools for this purpose.

    - + When merging two packages into a single package, the resulting POT file will be the concatenation of the two packages' POT files. Thus the maintainer must concatenate the two existing package translations into @@ -33,7 +33,7 @@ possible conflicts that arose during the merge.

    - + When a translator takes over the translation job from another translator, but she uses a different character encoding in her locale, she will convert the catalog to her character encoding. This is best done through @@ -49,8 +49,8 @@ that source file and use ‘msgmerge’.

    - - + + When a translator wants to adjust some translation catalog for a special dialect or orthography -- for example, German as written in Switzerland versus German as written in Germany -- she needs to apply some text @@ -67,14 +67,14 @@ that's why it's better to use the original POT file if available.

    - + When a translator wants to check her translations, for example according to orthography rules or using a non-interactive spell checker, she can do so using the ‘msgexec’ program.

    - + When third party tools create PO or POT files, sometimes duplicates cannot be avoided. But the GNU gettext tools give an error when they encounter duplicate msgids in the same file and in the same domain. @@ -92,7 +92,7 @@ completely translated.

    - + ‘msgattrib’ can be used to select and extract only the fuzzy or untranslated messages of a translation catalog. @@ -111,19 +111,19 @@ write other specialized programs that process PO files. -

    9.1 Invoking the msgcat Program

    +

    9.1 Invoking the msgcat Program

    - - + + 

     msgcat [option] [inputfile]...

    - - + + The msgcat program concatenates and merges the specified PO files. It finds messages which are common to two or more of the specified PO files. By using the --more-than option, greater commonality may be requested @@ -137,7 +137,7 @@ to define them. File positions from all PO files will be cumulated.

    -

    9.1.1 Input file location

    +

    9.1.1 Input file location

    @@ -149,8 +149,8 @@ Input files.
    ‘--files-from=file’
    - - + + Read the names of the input files from file instead of getting them from the command line. @@ -158,8 +158,8 @@ them from the command line.
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though. @@ -172,7 +172,7 @@ If inputfile is ‘-’, standard input is read.

    -

    9.1.2 Output file location

    +

    9.1.2 Output file location

    @@ -180,21 +180,21 @@ If inputfile is ‘-’, standard input is read.
    ‘--output-file=file’
    - - + + Write output to specified file.

    - + The results are written to standard output if no output file is specified or if it is ‘-’.

    -

    9.1.3 Message selection

    +

    9.1.3 Message selection

    @@ -202,8 +202,8 @@ or if it is ‘-’.
    ‘--less-than=number’
    - - + + Print messages with less than number definitions, defaults to infinite if not set. @@ -211,8 +211,8 @@ if not set.
    ‘--more-than=number’
    - - + + Print messages with more than number definitions, defaults to 0 if not set. @@ -220,8 +220,8 @@ set.
    ‘--unique’
    - - + + Shorthand for ‘--less-than=2’. Requests that only unique messages be printed. @@ -229,7 +229,7 @@ printed. -

    9.1.4 Input file syntax

    +

    9.1.4 Input file syntax

    @@ -237,14 +237,14 @@ printed.
    ‘--properties-input’
    - - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -252,7 +252,7 @@ Assume the input files are NeXTstep/GNUstep localized resource files in -

    9.1.5 Output details

    +

    9.1.5 Output details

    @@ -260,45 +260,59 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
    ‘--to-code=name’
    - - + + Specify encoding for output.
    ‘--use-first’
    - + Use first available translation for each message. Don't merge several translations into one. +
    ‘--color’ +
    +
    ‘--color=when’ +
    + +Specify whether or when to use colors and other text attributes. +See section 9.11.1 The --color option for details. + +
    ‘--style=style_file’ +
    + +Specify the CSS style rule file to use for --color. +See section 9.11.3 The --style option for details. +
    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘-i’
    ‘--indent’
    - - + + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘-n’
    ‘--add-location’
    - - + + Generate ‘#: filename:line’ lines (default).
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -307,15 +321,15 @@ GNU extensions.
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages.
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -323,15 +337,15 @@ Note that this file format doesn't support plural forms.
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -340,9 +354,9 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - - + + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -350,15 +364,15 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location.
    -

    9.1.6 Informative output

    +

    9.1.6 Informative output

    @@ -366,41 +380,41 @@ Sort output by file location.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit.
    -

    9.2 Invoking the msgconv Program

    +

    9.2 Invoking the msgconv Program

    - - + + 

     msgconv [option] [inputfile]

    - + The msgconv program converts a translation catalog to a different character encoding.

    -

    9.2.1 Input file location

    +

    9.2.1 Input file location

    @@ -412,8 +426,8 @@ Input PO file.
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though. @@ -426,7 +440,7 @@ If no inputfile is given or if it is ‘-’, st

    -

    9.2.2 Output file location

    +

    9.2.2 Output file location

    @@ -434,8 +448,8 @@ If no inputfile is given or if it is ‘-’, st
    ‘--output-file=file’
    - - + + Write output to specified file.
    @@ -447,7 +461,7 @@ or if it is ‘-’.

    -

    9.2.3 Conversion target

    +

    9.2.3 Conversion target

    @@ -455,8 +469,8 @@ or if it is ‘-’.
    ‘--to-code=name’
    - - + + Specify encoding for output.
    @@ -467,7 +481,7 @@ The default encoding is the current locale's encoding.

    -

    9.2.4 Input file syntax

    +

    9.2.4 Input file syntax

    @@ -475,14 +489,14 @@ The default encoding is the current locale's encoding.
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -490,36 +504,36 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in -

    9.2.5 Output details

    +

    9.2.5 Output details

    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘-i’
    ‘--indent’
    - - + + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘--add-location’
    - + Generate ‘#: filename:line’ lines (default).
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -528,15 +542,15 @@ GNU extensions.
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages.
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -544,15 +558,15 @@ Note that this file format doesn't support plural forms.
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -561,8 +575,8 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -570,15 +584,15 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location.
    -

    9.2.6 Informative output

    +

    9.2.6 Informative output

    @@ -586,41 +600,41 @@ Sort output by file location.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit.
    -

    9.3 Invoking the msggrep Program

    +

    9.3 Invoking the msggrep Program

    - - + + 

     msggrep [option] [inputfile]

    - + The msggrep program extracts all messages of a translation catalog that match a given pattern or belong to some given source files.

    -

    9.3.1 Input file location

    +

    9.3.1 Input file location

    @@ -632,8 +646,8 @@ Input PO file.
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though. @@ -646,7 +660,7 @@ If no inputfile is given or if it is ‘-’, st

    -

    9.3.2 Output file location

    +

    9.3.2 Output file location

    @@ -654,8 +668,8 @@ If no inputfile is given or if it is ‘-’, st
    ‘--output-file=file’
    - - + + Write output to specified file.
    @@ -667,12 +681,12 @@ or if it is ‘-’.

    -

    9.3.3 Message selection

    +

    9.3.3 Message selection

       [-N sourcefile]... [-M domainname]...
-  [-J msgctxt-pattern [-K msgid-pattern] [-T msgstr-pattern]
+  [-J msgctxt-pattern] [-K msgid-pattern] [-T msgstr-pattern]
   [-C comment-pattern]
    @@ -704,7 +718,7 @@ messages is the union of the selected messages of each criterion.

    -msgid-pattern or msgstr-pattern syntax: +msgctxt-pattern or msgid-pattern or msgstr-pattern syntax: 

       [-E | -F] [-e pattern | -f file]...
@@ -721,8 +735,8 @@ expressions if -E is given, or fixed strings if -F is given.
 
    
 
    ‘--location=sourcefile’
 
    
-
-
+
+
 Select messages extracted from sourcefile.  sourcefile can be
 either a literal file name or a wildcard pattern.
 
@@ -730,96 +744,96 @@ either a literal file name or a wildcard pattern.
 
    
 
    ‘--domain=domainname’
 
    
-
-
+
+
 Select messages belonging to domain domainname.
 
 
    ‘-J’
 
    
 
    ‘--msgctxt’
 
    
-
-
+
+
 Start of patterns for the msgctxt.
 
 
    ‘-K’
 
    
 
    ‘--msgid’
 
    
-
-
+
+
 Start of patterns for the msgid.
 
 
    ‘-T’
 
    
 
    ‘--msgstr’
 
    
-
-
+
+
 Start of patterns for the msgstr.
 
 
    ‘-C’
 
    
 
    ‘--comment’
 
    
-
-
+
+
 Start of patterns for the translator's comment.
 
 
    ‘-X’
 
    
 
    ‘--extracted-comment’
 
    
-
-
+
+
 Start of patterns for the extracted comments.
 
 
    ‘-E’
 
    
 
    ‘--extended-regexp’
 
    
-
-
+
+
 Specify that pattern is an extended regular expression.
 
 
    ‘-F’
 
    
 
    ‘--fixed-strings’
 
    
-
-
+
+
 Specify that pattern is a set of newline-separated strings.
 
 
    ‘-e pattern’
 
    
 
    ‘--regexp=pattern’
 
    
-
-
+
+
 Use pattern as a regular expression.
 
 
    ‘-f file’
 
    
 
    ‘--file=file’
 
    
-
-
+
+
 Obtain pattern from file.
 
 
    ‘-i’
 
    
 
    ‘--ignore-case’
 
    
-
-
+
+
 Ignore case distinctions.
 
 
    ‘-v’
 
    
 
    ‘--invert-match’
 
    
-
-
+
+
 Output only the messages that do not match any selection criterion, instead
 of the messages that match a selection criterion.
 
@@ -827,7 +841,7 @@ of the messages that match a selection criterion.
 
 
 
-
    9.3.4  Input file syntax
    
+
    9.3.4  Input file syntax
    
 
 
    
 
@@ -835,14 +849,14 @@ of the messages that match a selection criterion.
 
    
 
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input file is a Java ResourceBundle in Java .properties
 syntax, not in PO file syntax.
 
 
    ‘--stringtable-input’
 
    
-
+
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 .strings syntax, not in PO file syntax.
 
@@ -850,33 +864,33 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
 
 
-
    9.3.5  Output details
    
+
    9.3.5  Output details
    
 
 
    
 
 
    ‘--force-po’
 
    
-
+
 Always write an output file even if it contains no message.
 
 
    ‘--indent’
 
    
-
+
 Write the .po file using indented style.
 
 
    ‘--no-location’
 
    
-
+
 Do not write ‘#: filename:line’ lines.
 
 
    ‘--add-location’
 
    
-
+
 Generate ‘#: filename:line’ lines (default).
 
 
    ‘--strict’
 
    
-
+
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -885,15 +899,15 @@ GNU extensions.
 
    
 
    ‘--properties-output’
 
    
-
-
+
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
@@ -901,35 +915,35 @@ Note that this file format doesn't support plural forms.
 
    
 
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
 
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
 
 
    ‘--sort-output’
 
    
-
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
 
    ‘--sort-by-file’
 
    
-
+
 Sort output by file location.
 
 
    
 
 
 
-
    9.3.6  Informative output
    
+
    9.3.6  Informative output
    
 
 
    
 
@@ -937,41 +951,85 @@ Sort output by file location.
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    9.4  Invoking the msgfilter Program
    
+
    9.3.7  Examples
    
 
 
    
-
-
+To extract the messages that come from the source files
+gnulib-lib/error.c and gnulib-lib/getopt.c:
+
+
    
+
+
    +msggrep -N gnulib-lib/error.c -N gnulib-lib/getopt.c input.po
+
    
+
+
    
+To extract the messages that contain the string “Please specify” in the
+original string:
+
+
    
+
+
    +msggrep --msgid -F -e 'Please specify' input.po
+
    
+
+
    
+To extract the messages that have a context specifier of either “Menu>File”
+or “Menu>Edit” or a submenu of them:
+
+
    
+
+
    +msggrep --msgctxt -E -e '^Menu>(File|Edit)' input.po
+
    
+
+
    
+To extract the messages whose translation contains one of the strings in the
+file wordlist.txt:
+
+
    
+
+
    +msggrep --msgstr -F -f wordlist.txt input.po
+
    
+
+
+
+
    9.4  Invoking the msgfilter Program
    
+
+
    
+
+
 
 
     msgfilter [option] filter [filter-option]
 
    
 
 
    
-
+
 The msgfilter program applies a filter to all translations of a
 translation catalog.
 
 
    
 
 
-
    9.4.1  Input file location
    
+
    9.4.1  Input file location
    
 
 
    
 
@@ -979,16 +1037,16 @@ translation catalog.
 
    
 
    ‘--input=inputfile’
 
    
-
-
+
+
 Input PO file.
 
 
    ‘-D directory’
 
    
 
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting ‘.po’
 file will be written relative to the current directory, though.
@@ -1001,7 +1059,7 @@ If no inputfile is given or if it is ‘-’, st
 
    
 
 
-
    9.4.2  Output file location
    
+
    9.4.2  Output file location
    
 
 
    
 
@@ -1009,8 +1067,8 @@ If no inputfile is given or if it is ‘-’, st
 
    
 
    ‘--output-file=file’
 
    
-
-
+
+
 Write output to specified file.
 
 
    
@@ -1022,7 +1080,7 @@ or if it is ‘-’.
 
    
 
 
-
    9.4.3  The filter
    
+
    9.4.3  The filter
    
 
 
    
 The filter can be any program that reads a translation from standard
@@ -1032,7 +1090,7 @@ recognized.
 
 
    
 
    
-
+
 Note: If the filter is not a built-in filter, you have to care about encodings:
 It is your responsibility to ensure that the filter can cope
 with input encoded in the translation catalog's encoding.  If the
@@ -1046,7 +1104,7 @@ locale, by using the LC_ALL environment variable.
 
 
    
 
    
-
+
 Note: Most translations in a translation catalog don't end with a newline
 character.  For this reason, it is important that the filter
 recognizes its last input line even if it ends without a newline, and that
@@ -1058,7 +1116,7 @@ does not have this limitation.
 
    
 
 
-
    9.4.4  Useful filter-options when the filter is ‘sed’
    
+
    9.4.4  Useful filter-options when the filter is ‘sed’
    
 
 
    
 
@@ -1066,16 +1124,16 @@ does not have this limitation.
 
    
 
    ‘--expression=script’
 
    
-
-
+
+
 Add script to the commands to be executed.
 
 
    ‘-f scriptfile’
 
    
 
    ‘--file=scriptfile’
 
    
-
-
+
+
 Add the contents of scriptfile to the commands to be executed.
 
 
    ‘-n’
@@ -1084,20 +1142,20 @@ Add the contents of scriptfile to the commands to be executed.
 
    
 
    ‘--silent’
 
    
-
-
-
+
+
+
 Suppress automatic printing of pattern space.
 
 
    
 
 
 
-
    9.4.5  Built-in filters
    
+
    9.4.5  Built-in filters
    
 
 
    
-
-
+
+
 The filter ‘recode-sr-latin’ is recognized as a built-in filter.
 The command ‘recode-sr-latin’ converts Serbian text, written in the
 Cyrillic script, to the Latin script.
@@ -1114,7 +1172,7 @@ convert the message catalog to the UTF-8 encoding when needed.
 
    
 
 
-
    9.4.6  Input file syntax
    
+
    9.4.6  Input file syntax
    
 
 
    
 
@@ -1122,14 +1180,14 @@ convert the message catalog to the UTF-8 encoding when needed.
 
    
 
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input file is a Java ResourceBundle in Java .properties
 syntax, not in PO file syntax.
 
 
    ‘--stringtable-input’
 
    
-
+
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 .strings syntax, not in PO file syntax.
 
@@ -1137,40 +1195,40 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
 
 
-
    9.4.7  Output details
    
+
    9.4.7  Output details
    
 
 
    
 
 
    ‘--force-po’
 
    
-
+
 Always write an output file even if it contains no message.
 
 
    ‘--indent’
 
    
-
+
 Write the .po file using indented style.
 
 
    ‘--keep-header’
 
    
-
+
 Keep the header entry, i.e. the message with ‘msgid ""’, unmodified,
 instead of filtering it.  By default, the header entry is subject to
 filtering like any other message.
 
 
    ‘--no-location’
 
    
-
+
 Do not write ‘#: filename:line’ lines.
 
 
    ‘--add-location’
 
    
-
+
 Generate ‘#: filename:line’ lines (default).
 
 
    ‘--strict’
 
    
-
+
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1179,15 +1237,15 @@ GNU extensions.
 
    
 
    ‘--properties-output’
 
    
-
-
+
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
@@ -1195,15 +1253,15 @@ Note that this file format doesn't support plural forms.
 
    
 
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
 
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1212,8 +1270,8 @@ lines which are wider than the output page width will be split.
 
    
 
    ‘--sort-output’
 
    
-
-
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1221,15 +1279,15 @@ for the translator to understand each message's context.
 
    
 
    ‘--sort-by-file’
 
    
-
-
+
+
 Sort output by file location.
 
 
    
 
 
 
-
    9.4.8  Informative output
    
+
    9.4.8  Informative output
    
 
 
    
 
@@ -1237,35 +1295,57 @@ Sort output by file location.
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    9.5  Invoking the msguniq Program
    
+
    9.4.9  Examples
    
 
 
    
-
-
+To convert German translations to Swiss orthography (in an UTF-8 locale):
+
+
    
+
+
    +msgconv -t UTF-8 de.po | msgfilter sed -e 's/ß/ss/g'
+
    
+
+
    
+To convert Serbian translations in Cyrillic script to Latin script:
+
+
    
+
+
    +msgfilter recode-sr-latin sr.po
+
    
+
+
+
+
    9.5  Invoking the msguniq Program
    
+
+
    
+
+
 
 
     msguniq [option] [inputfile]
 
    
 
 
    
-
-
+
+
 The msguniq program unifies duplicate translations in a translation
 catalog.  It finds duplicate translations of the same message ID.  Such
 duplicates are invalid input for other programs like msgfmt,
@@ -1280,7 +1360,7 @@ discarded.
 
    
 
 
-
    9.5.1  Input file location
    
+
    9.5.1  Input file location
    
 
 
    
 
@@ -1292,8 +1372,8 @@ Input PO file.
 
    
 
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting ‘.po’
 file will be written relative to the current directory, though.
@@ -1306,7 +1386,7 @@ If no inputfile is given or if it is ‘-’, st
 
    
 
 
-
    9.5.2  Output file location
    
+
    9.5.2  Output file location
    
 
 
    
 
@@ -1314,8 +1394,8 @@ If no inputfile is given or if it is ‘-’, st
 
    
 
    ‘--output-file=file’
 
    
-
-
+
+
 Write output to specified file.
 
 
    
@@ -1327,7 +1407,7 @@ or if it is ‘-’.
 
    
 
 
-
    9.5.3  Message selection
    
+
    9.5.3  Message selection
    
 
 
    
 
@@ -1335,23 +1415,23 @@ or if it is ‘-’.
 
    
 
    ‘--repeated’
 
    
-
-
+
+
 Print only duplicates.
 
 
    ‘-u’
 
    
 
    ‘--unique’
 
    
-
-
+
+
 Print only unique messages, discard duplicates.
 
 
    
 
 
 
-
    9.5.4  Input file syntax
    
+
    9.5.4  Input file syntax
    
 
 
    
 
@@ -1359,14 +1439,14 @@ Print only unique messages, discard duplicates.
 
    
 
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input file is a Java ResourceBundle in Java .properties
 syntax, not in PO file syntax.
 
 
    ‘--stringtable-input’
 
    
-
+
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 .strings syntax, not in PO file syntax.
 
@@ -1374,7 +1454,7 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
 
 
-
    9.5.5  Output details
    
+
    9.5.5  Output details
    
 
 
    
 
@@ -1382,45 +1462,45 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
    
 
    ‘--to-code=name’
 
    
-
-
+
+
 Specify encoding for output.
 
 
    ‘--use-first’
 
    
-
+
 Use first available translation for each message.  Don't merge several
 translations into one.
 
 
    ‘--force-po’
 
    
-
+
 Always write an output file even if it contains no message.
 
 
    ‘-i’
 
    
 
    ‘--indent’
 
    
-
-
+
+
 Write the .po file using indented style.
 
 
    ‘--no-location’
 
    
-
+
 Do not write ‘#: filename:line’ lines.
 
 
    ‘-n’
 
    
 
    ‘--add-location’
 
    
-
-
+
+
 Generate ‘#: filename:line’ lines (default).
 
 
    ‘--strict’
 
    
-
+
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1429,15 +1509,15 @@ GNU extensions.
 
    
 
    ‘--properties-output’
 
    
-
-
+
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
@@ -1445,15 +1525,15 @@ Note that this file format doesn't support plural forms.
 
    
 
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
 
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1462,8 +1542,8 @@ lines which are wider than the output page width will be split.
 
    
 
    ‘--sort-output’
 
    
-
-
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1471,15 +1551,15 @@ for the translator to understand each message's context.
 
    
 
    ‘--sort-by-file’
 
    
-
-
+
+
 Sort output by file location.
 
 
    
 
 
 
-
    9.5.6  Informative output
    
+
    9.5.6  Informative output
    
 
 
    
 
@@ -1487,34 +1567,34 @@ Sort output by file location.
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    9.6  Invoking the msgcomm Program
    
+
    9.6  Invoking the msgcomm Program
    
 
 
    
-
-
+
+
 
 
     msgcomm [option] [inputfile]...
 
    
 
 
    
-
+
 The msgcomm program finds messages which are common to two or more
 of the specified PO files.
 By using the --more-than option, greater commonality may be requested
@@ -1528,7 +1608,7 @@ cumulated.
 
    
 
 
-
    9.6.1  Input file location
    
+
    9.6.1  Input file location
    
 
 
    
 
@@ -1540,8 +1620,8 @@ Input files.
 
    
 
    ‘--files-from=file’
 
    
-
-
+
+
 Read the names of the input files from file instead of getting
 them from the command line.
 
@@ -1549,8 +1629,8 @@ them from the command line.
 
    
 
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting ‘.po’
 file will be written relative to the current directory, though.
@@ -1563,7 +1643,7 @@ If inputfile is ‘-’, standard input is read.
 
    
 
 
-
    9.6.2  Output file location
    
+
    9.6.2  Output file location
    
 
 
    
 
@@ -1571,8 +1651,8 @@ If inputfile is ‘-’, standard input is read.
 
    
 
    ‘--output-file=file’
 
    
-
-
+
+
 Write output to specified file.
 
 
    
@@ -1584,7 +1664,7 @@ or if it is ‘-’.
 
    
 
 
-
    9.6.3  Message selection
    
+
    9.6.3  Message selection
    
 
 
    
 
@@ -1592,8 +1672,8 @@ or if it is ‘-’.
 
    
 
    ‘--less-than=number’
 
    
-
-
+
+
 Print messages with less than number definitions, defaults to infinite
 if not set.
 
@@ -1601,8 +1681,8 @@ if not set.
 
    
 
    ‘--more-than=number’
 
    
-
-
+
+
 Print messages with more than number definitions, defaults to 1 if not
 set.
 
@@ -1610,8 +1690,8 @@ set.
 
    
 
    ‘--unique’
 
    
-
-
+
+
 Shorthand for ‘--less-than=2’.  Requests that only unique messages be
 printed.
 
@@ -1619,7 +1699,7 @@ printed.
 
 
 
-
    9.6.4  Input file syntax
    
+
    9.6.4  Input file syntax
    
 
 
    
 
@@ -1627,14 +1707,14 @@ printed.
 
    
 
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input files are Java ResourceBundles in Java .properties
 syntax, not in PO file syntax.
 
 
    ‘--stringtable-input’
 
    
-
+
 Assume the input files are NeXTstep/GNUstep localized resource files in
 .strings syntax, not in PO file syntax.
 
@@ -1642,39 +1722,39 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 
 
 
-
    9.6.5  Output details
    
+
    9.6.5  Output details
    
 
 
    
 
 
    ‘--force-po’
 
    
-
+
 Always write an output file even if it contains no message.
 
 
    ‘-i’
 
    
 
    ‘--indent’
 
    
-
-
+
+
 Write the .po file using indented style.
 
 
    ‘--no-location’
 
    
-
+
 Do not write ‘#: filename:line’ lines.
 
 
    ‘-n’
 
    
 
    ‘--add-location’
 
    
-
-
+
+
 Generate ‘#: filename:line’ lines (default).
 
 
    ‘--strict’
 
    
-
+
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1683,15 +1763,15 @@ GNU extensions.
 
    
 
    ‘--properties-output’
 
    
-
-
+
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
@@ -1699,15 +1779,15 @@ Note that this file format doesn't support plural forms.
 
    
 
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
 
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1716,8 +1796,8 @@ lines which are wider than the output page width will be split.
 
    
 
    ‘--sort-output’
 
    
-
-
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1725,20 +1805,20 @@ for the translator to understand each message's context.
 
    
 
    ‘--sort-by-file’
 
    
-
-
+
+
 Sort output by file location.
 
 
    ‘--omit-header’
 
    
-
+
 Don't write header with ‘msgid ""’ entry.
 
 
    
 
 
 
-
    9.6.6  Informative output
    
+
    9.6.6  Informative output
    
 
 
    
 
@@ -1746,34 +1826,34 @@ Don't write header with ‘msgid ""’ entry.
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    9.7  Invoking the msgcmp Program
    
+
    9.7  Invoking the msgcmp Program
    
 
 
    
-
-
+
+
 
 
     msgcmp [option] def.po ref.pot
 
    
 
 
    
-
+
 The msgcmp program compares two Uniforum style .po files to check that
 both contain the same set of msgid strings.  The def.po file is an
 existing PO file with the translations.  The ref.pot file is the last
@@ -1785,7 +1865,7 @@ used to produce better diagnostics.
 
    
 
 
-
    9.7.1  Input file location
    
+
    9.7.1  Input file location
    
 
 
    
 
@@ -1801,8 +1881,8 @@ References to the sources.
 
    
 
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
 searched relative to this list of directories.
 
@@ -1810,7 +1890,7 @@ searched relative to this list of directories.
 
 
 
-
    9.7.2  Operation modifiers
    
+
    9.7.2  Operation modifiers
    
 
 
    
 
@@ -1818,20 +1898,20 @@ searched relative to this list of directories.
 
    
 
    ‘--multi-domain’
 
    
-
-
+
+
 Apply ref.pot to each of the domains in def.po.
 
 
    ‘--use-fuzzy’
 
    
-
+
 Consider fuzzy messages in the def.po file like translated messages.
 Note that using this option is usually wrong, because fuzzy messages are
 exactly those which have not been validated by a human translator.
 
 
    ‘--use-untranslated’
 
    
-
+
 Consider untranslated messages in the def.po file like translated
 messages.  Note that using this option is usually wrong.
 
@@ -1839,7 +1919,7 @@ messages.  Note that using this option is usually wrong.
 
 
 
-
    9.7.3  Input file syntax
    
+
    9.7.3  Input file syntax
    
 
 
    
 
@@ -1847,14 +1927,14 @@ messages.  Note that using this option is usually wrong.
 
    
 
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input files are Java ResourceBundles in Java .properties
 syntax, not in PO file syntax.
 
 
    ‘--stringtable-input’
 
    
-
+
 Assume the input files are NeXTstep/GNUstep localized resource files in
 .strings syntax, not in PO file syntax.
 
@@ -1862,7 +1942,7 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 
 
 
-
    9.7.4  Informative output
    
+
    9.7.4  Informative output
    
 
 
    
 
@@ -1870,42 +1950,42 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    9.8  Invoking the msgattrib Program
    
+
    9.8  Invoking the msgattrib Program
    
 
 
    
-
-
+
+
 
 
     msgattrib [option] [inputfile]
 
    
 
 
    
-
-
+
+
 The msgattrib program filters the messages of a translation catalog
 according to their attributes, and manipulates the attributes.
 
 
    
 
 
-
    9.8.1  Input file location
    
+
    9.8.1  Input file location
    
 
 
    
 
@@ -1917,8 +1997,8 @@ Input PO file.
 
    
 
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting ‘.po’
 file will be written relative to the current directory, though.
@@ -1931,7 +2011,7 @@ If no inputfile is given or if it is ‘-’, st
 
    
 
 
-
    9.8.2  Output file location
    
+
    9.8.2  Output file location
    
 
 
    
 
@@ -1939,8 +2019,8 @@ If no inputfile is given or if it is ‘-’, st
 
    
 
    ‘--output-file=file’
 
    
-
-
+
+
 Write output to specified file.
 
 
    
@@ -1952,52 +2032,52 @@ or if it is ‘-’.
 
    
 
 
-
    9.8.3  Message selection
    
+
    9.8.3  Message selection
    
 
 
    
 
 
    ‘--translated’
 
    
-
+
 Keep translated messages, remove untranslated messages.
 
 
    ‘--untranslated’
 
    
-
+
 Keep untranslated messages, remove translated messages.
 
 
    ‘--no-fuzzy’
 
    
-
+
 Remove
 ‘fuzzy’
 marked messages.
 
 
    ‘--only-fuzzy’
 
    
-
+
 Keep
 ‘fuzzy’
 marked messages, remove all other messages.
 
 
    ‘--no-obsolete’
 
    
-
+
 Remove obsolete #~ messages.
 
 
    ‘--only-obsolete’
 
    
-
+
 Keep obsolete #~ messages, remove all other messages.
 
 
    
 
 
 
-
    9.8.4  Attribute manipulation
    
+
    9.8.4  Attribute manipulation
    
 
 
    
-
+
 Attributes are modified after the message selection/removal has been
 performed.  If the ‘--only-file’ or ‘--ignore-file’ option is
 specified, the attribute modification is applied only to those messages
@@ -2009,46 +2089,46 @@ that are listed in the only-file and not listed in the
 
 
    ‘--set-fuzzy’
 
    
-
+
 Set all messages
 ‘fuzzy’.
 
 
    ‘--clear-fuzzy’
 
    
-
+
 Set all messages
 non-‘fuzzy’.
 
 
    ‘--set-obsolete’
 
    
-
+
 Set all messages obsolete.
 
 
    ‘--clear-obsolete’
 
    
-
+
 Set all messages non-obsolete.
 
 
    ‘--clear-previous’
 
    
-
+
 Remove the “previous msgid” (‘#|’) comments from all messages.
 
 
    ‘--only-file=file’
 
    
-
+
 Limit the attribute changes to entries that are listed in file.
 file should be a PO or POT file.
 
 
    ‘--ignore-file=file’
 
    
-
+
 Limit the attribute changes to entries that are not listed in file.
 file should be a PO or POT file.
 
 
    ‘--fuzzy’
 
    
-
+
 Synonym for ‘--only-fuzzy --clear-fuzzy’: It keeps only the fuzzy
 messages and removes their
 ‘fuzzy’
@@ -2056,7 +2136,7 @@ mark.
 
 
    ‘--obsolete’
 
    
-
+
 Synonym for ‘--only-obsolete --clear-obsolete’: It keeps only the
 obsolete messages and makes them non-obsolete.
 
@@ -2064,7 +2144,7 @@ obsolete messages and makes them non-obsolete.
 
 
 
-
    9.8.5  Input file syntax
    
+
    9.8.5  Input file syntax
    
 
 
    
 
@@ -2072,14 +2152,14 @@ obsolete messages and makes them non-obsolete.
 
    
 
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input file is a Java ResourceBundle in Java .properties
 syntax, not in PO file syntax.
 
 
    ‘--stringtable-input’
 
    
-
+
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 .strings syntax, not in PO file syntax.
 
@@ -2087,39 +2167,39 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
 
 
-
    9.8.6  Output details
    
+
    9.8.6  Output details
    
 
 
    
 
 
    ‘--force-po’
 
    
-
+
 Always write an output file even if it contains no message.
 
 
    ‘-i’
 
    
 
    ‘--indent’
 
    
-
-
+
+
 Write the .po file using indented style.
 
 
    ‘--no-location’
 
    
-
+
 Do not write ‘#: filename:line’ lines.
 
 
    ‘-n’
 
    
 
    ‘--add-location’
 
    
-
-
+
+
 Generate ‘#: filename:line’ lines (default).
 
 
    ‘--strict’
 
    
-
+
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -2128,15 +2208,15 @@ GNU extensions.
 
    
 
    ‘--properties-output’
 
    
-
-
+
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
@@ -2144,15 +2224,15 @@ Note that this file format doesn't support plural forms.
 
    
 
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
 
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -2161,8 +2241,8 @@ lines which are wider than the output page width will be split.
 
    
 
    ‘--sort-output’
 
    
-
-
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -2170,15 +2250,15 @@ for the translator to understand each message's context.
 
    
 
    ‘--sort-by-file’
 
    
-
-
+
+
 Sort output by file location.
 
 
    
 
 
 
-
    9.8.7  Informative output
    
+
    9.8.7  Informative output
    
 
 
    
 
@@ -2186,34 +2266,34 @@ Sort output by file location.
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    9.9  Invoking the msgen Program
    
+
    9.9  Invoking the msgen Program
    
 
 
    
-
-
+
+
 
 
     msgen [option] inputfile
 
    
 
 
    
-
+
 The msgen program creates an English translation catalog.  The
 input file is the last created English PO file, or a PO Template file
 (generally created by xgettext).  Untranslated entries are assigned a
@@ -2228,7 +2308,7 @@ the header entry, whereas msgen doesn't.
 
    
 
 
-
    9.9.1  Input file location
    
+
    9.9.1  Input file location
    
 
 
    
 
@@ -2240,8 +2320,8 @@ Input PO or POT file.
 
    
 
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting ‘.po’
 file will be written relative to the current directory, though.
@@ -2254,7 +2334,7 @@ If inputfile is ‘-’, standard input is read.
 
    
 
 
-
    9.9.2  Output file location
    
+
    9.9.2  Output file location
    
 
 
    
 
@@ -2262,8 +2342,8 @@ If inputfile is ‘-’, standard input is read.
 
    
 
    ‘--output-file=file’
 
    
-
-
+
+
 Write output to specified file.
 
 
    
@@ -2275,7 +2355,7 @@ or if it is ‘-’.
 
    
 
 
-
    9.9.3  Input file syntax
    
+
    9.9.3  Input file syntax
    
 
 
    
 
@@ -2283,14 +2363,14 @@ or if it is ‘-’.
 
    
 
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input file is a Java ResourceBundle in Java .properties
 syntax, not in PO file syntax.
 
 
    ‘--stringtable-input’
 
    
-
+
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 .strings syntax, not in PO file syntax.
 
@@ -2298,36 +2378,36 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
 
 
-
    9.9.4  Output details
    
+
    9.9.4  Output details
    
 
 
    
 
 
    ‘--force-po’
 
    
-
+
 Always write an output file even if it contains no message.
 
 
    ‘-i’
 
    
 
    ‘--indent’
 
    
-
-
+
+
 Write the .po file using indented style.
 
 
    ‘--no-location’
 
    
-
+
 Do not write ‘#: filename:line’ lines.
 
 
    ‘--add-location’
 
    
-
+
 Generate ‘#: filename:line’ lines (default).
 
 
    ‘--strict’
 
    
-
+
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -2336,15 +2416,15 @@ GNU extensions.
 
    
 
    ‘--properties-output’
 
    
-
-
+
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
@@ -2352,15 +2432,15 @@ Note that this file format doesn't support plural forms.
 
    
 
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
 
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -2369,8 +2449,8 @@ lines which are wider than the output page width will be split.
 
    
 
    ‘--sort-output’
 
    
-
-
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -2378,15 +2458,15 @@ for the translator to understand each message's context.
 
    
 
    ‘--sort-by-file’
 
    
-
-
+
+
 Sort output by file location.
 
 
    
 
 
 
-
    9.9.5  Informative output
    
+
    9.9.5  Informative output
    
 
 
    
 
@@ -2394,34 +2474,34 @@ Sort output by file location.
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    9.10  Invoking the msgexec Program
    
+
    9.10  Invoking the msgexec Program
    
 
 
    
-
-
+
+
 
 
     msgexec [option] command [command-option]
 
    
 
 
    
-
+
 The msgexec program applies a command to all translations of a
 translation catalog.
 The command can be any program that reads a translation from standard
@@ -2431,16 +2511,16 @@ across all invocations.
 
 
    
 
    
-
+
 A special builtin command called ‘0’ outputs the translation, followed
 by a null byte.  The output of ‘msgexec 0’ is suitable as input for
 ‘xargs -0’.
 
 
    
 
    
-
-
-
+
+
+
 During each command invocation, the environment variable
 MSGEXEC_MSGID is bound to the message's msgid, and the environment
 variable MSGEXEC_LOCATION is bound to the location in the PO file
@@ -2450,7 +2530,7 @@ unbound.
 
 
    
 
    
-
+
 Note: It is your responsibility to ensure that the command can cope
 with input encoded in the translation catalog's encoding.  If the
 command wants input in a particular encoding, you can in a first step
@@ -2464,7 +2544,7 @@ locale, by using the LC_ALL environment variable.
 
    
 
 
-
    9.10.1  Input file location
    
+
    9.10.1  Input file location
    
 
 
    
 
@@ -2472,16 +2552,16 @@ locale, by using the LC_ALL environment variable.
 
    
 
    ‘--input=inputfile’
 
    
-
-
+
+
 Input PO file.
 
 
    ‘-D directory’
 
    
 
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting ‘.po’
 file will be written relative to the current directory, though.
@@ -2494,7 +2574,7 @@ If no inputfile is given or if it is ‘-’, st
 
    
 
 
-
    9.10.2  Input file syntax
    
+
    9.10.2  Input file syntax
    
 
 
    
 
@@ -2502,14 +2582,14 @@ If no inputfile is given or if it is ‘-’, st
 
    
 
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input file is a Java ResourceBundle in Java .properties
 syntax, not in PO file syntax.
 
 
    ‘--stringtable-input’
 
    
-
+
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 .strings syntax, not in PO file syntax.
 
@@ -2517,7 +2597,7 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
 
 
-
    9.10.3  Informative output
    
+
    9.10.3  Informative output
    
 
 
    
 
@@ -2525,23 +2605,542 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
    
 
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
 
    ‘-V’
 
    
 
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    9.11  Writing your own programs that process PO files
    
+
    9.11  Highlighting parts of PO files
    
+
+
    
+Translators are usually only interested in seeing the untranslated and
+fuzzy messages of a PO file.  Also, when a message is set fuzzy because
+the msgid changed, they want to see the differences between the previous
+msgid and the current one (especially if the msgid is long and only few
+words in it have changed).  Finally, it's always welcome to highlight the
+different sections of a message in a PO file (comments, msgid, msgstr, etc.).
+
+
    
+
    
+Such highlighting is possible through the msgcat options
+‘--color’ and ‘--style’.
+
+
    
+
+
+
+
    9.11.1  The --color option
    
+
+
    
+
+The ‘--color=when’ option specifies under which conditions
+colorized output should be generated.  The when part can be one of
+the following:
+
+
    
+
    
+
+
    always
+
    
+
    yes
+
    
+The output will be colorized.
+
+
    never
+
    
+
    no
+
    
+The output will not be colorized.
+
+
    auto
+
    
+
    tty
+
    
+The output will be colorized if the output device is a tty, i.e. when the
+output goes directly to a text screen or terminal emulator window.
+
+
    html
+
    
+The output will be colorized and be in HTML format.
+
    
+
+
    
+‘--color’ is equivalent to ‘--color=yes’.  The default is
+‘--color=auto’.
+
+
    
+
    
+Thus, a command like ‘msgcat vi.po’ will produce colorized output
+when called by itself in a command window.  Whereas in a pipe, such as
+‘msgcat vi.po | less -R’, it will not produce colorized output.  To
+get colorized output in this situation nevertheless, use the command
+‘msgcat --color vi.po | less -R’.
+
+
    
+
    
+The ‘--color=html’ option will produce output that can be viewed in
+a browser.  This can be useful, for example, for Indic languages,
+because the renderic of Indic scripts in browser is usually better than
+in terminal emulators.
+
+
    
+
    
+Note that the output produced with the --color option is not
+a valid PO file in itself.  It contains additional terminal-specific escape
+sequences or HTML tags.  A PO file reader will give a syntax error when
+confronted with such content.  Except for the ‘--color=html’ case,
+you therefore normally don't need to save output produced with the
+--color option in a file.
+
+
    
+
+
+
    9.11.2  The environment variable TERM
    
+
+
    
+
+The environment variable TERM contains a identifier for the text
+window's capabilities.  You can get a detailed list of these cababilities
+by using the ‘infocmp’ command, using ‘man 5 terminfo’ as a
+reference.
+
+
    
+
    
+When producing text with embedded color directives, msgcat looks
+at the TERM variable.  Text windows today typically support at least
+8 colors.  Often, however, the text window supports 16 or more colors,
+even though the TERM variable is set to a identifier denoting only
+8 supported colors.  It can be worth setting the TERM variable to
+a different value in these cases:
+
+
    
+
    
+
+
    xterm
+
    
+xterm is in most cases built with support for 16 colors.  It can also
+be built with support for 88 or 256 colors (but not both).  You can try to
+set TERM to either xterm-16color, xterm-88color, or
+xterm-256color.
+
+
    rxvt
+
    
+rxvt is often built with support for 16 colors.  You can try to set
+TERM to rxvt-16color.
+
+
    konsole
+
    
+konsole too is often built with support for 16 colors.  You can try to
+set TERM to konsole-16color or xterm-16color.
+
    
+
+
    
+After setting TERM, you can verify it by invoking
+‘msgcat --color=test’ and seeing whether the output looks like a
+reasonable color map.
+
+
    
+
+
+
    9.11.3  The --style option
    
+
+
    
+
+The ‘--style=style_file’ option specifies the style file to use
+when colorizing.  It has an effect only when the --color option is
+effective.
+
+
    
+
    
+
+If the --style option is not specified, the environment variable
+PO_STYLE is considered.  It is meant to point to the user's
+preferred style for PO files.
+
+
    
+
    
+The default style file is ‘$prefix/share/gettext/styles/po-default.css’,
+where $prefix is the installation location.
+
+
    
+
    
+A few style files are predefined:
+
    
+
+
    ‘po-vim.css’
+
    
+This style imitates the look used by vim 7.
+
+
    ‘po-emacs-x.css’
+
    
+This style imitates the look used by GNU Emacs 21 and 22 in an X11 window.
+
+
    ‘po-emacs-xterm.css’
+
    
+
    ‘po-emacs-xterm16.css’
+
    
+
    ‘po-emacs-xterm256.css’
+
    
+This style imitates the look used by GNU Emacs 22 in a terminal of type
+‘xterm’ (8 colors) or ‘xterm-16color’ (16 colors) or
+‘xterm-256color’ (256 colors), respectively.
+
    
+
+
    
+You can use these styles without specifying a directory.  They are actually
+located in ‘$prefix/share/gettext/styles/’, where $prefix is the
+installation location.
+
+
    
+
    
+You can also design your own styles.  This is described in the next section.
+
+
    
+
+
+
+
    9.11.4  Style rules for PO files
    
+
+
    
+The same style file can be used for styling of a PO file, for terminal
+output and for HTML output.  It is written in CSS (Cascading Style Sheet)
+syntax.  See http://www.w3.org/TR/css2/cover.html for a formal
+definition of CSS.  Many HTML authoring tutorials also contain explanations
+of CSS.
+
+
    
+
    
+In the case of HTML output, the style file is embedded in the HTML output.
+In the case of text output, the style file is interpreted by the
+msgcat program.  This means, in particular, that when
+@import is used with relative file names, the file names are
+
+
    
+
+
      
+
    • 
+
+relative to the resulting HTML file, in the case of HTML output,
+
+
    • 
+
+relative to the style sheet containing the @import, in the case of
+text output.  (Actually, @imports are not yet supported in this case,
+due to a limitation in libcroco.)
+
    
+
+
    
+CSS rules are built up from selectors and declarations.  The declarations
+specify graphical properties; the selectors specify specify when they apply.
+
+
    
+
    
+In PO files, the following simple selectors (based on "CSS classes", see
+the CSS2 spec, section 5.8.3) are supported.
+
+
    
+
+
      
+
    • 
+
+Selectors that apply to entire messages:
+
+
      
+
+
      .header
+
      
+This matches the header entry of a PO file.
+
+
      .translated
+
      
+This matches a translated message.
+
+
      .untranslated
+
      
+This matches an untranslated message (i.e. a message with empty translation).
+
+
      .fuzzy
+
      
+This matches a fuzzy message (i.e. a message which has a translation that
+needs review by the translator).
+
+
      .obsolete
+
      
+This matches an obsolete message (i.e. a message that was translated but is
+not needed by the current POT file any more).
+
      
+
+
    • 
+
+Selectors that apply to parts of a message in PO syntax.  Recall the general
+structure of a message in PO syntax:
+
+
+
      +white-space
+#  translator-comments
+#. extracted-comments
+#: reference...
+#, flag...
+#| msgid previous-untranslated-string
+msgid untranslated-string
+msgstr translated-string
+
      
+
+
      
+
+
      .comment
+
      
+This matches all comments (translator comments, extracted comments,
+source file reference comments, flag comments, previous message comments,
+as well as the entire obsolete messages).
+
+
      .translator-comment
+
      
+This matches the translator comments.
+
+
      .extracted-comment
+
      
+This matches the extracted comments, i.e. the comments placed by the
+programmer at the attention of the translator.
+
+
      .reference-comment
+
      
+This matches the source file reference comments (entire lines).
+
+
      .reference
+
      
+This matches the individual source file references inside the source file
+reference comment lines.
+
+
      .flag-comment
+
      
+This matches the flag comment lines (entire lines).
+
+
      .flag
+
      
+This matches the individual flags inside flag comment lines.
+
+
      .fuzzy-flag
+
      
+This matches the `fuzzy' flag inside flag comment lines.
+
+
      .previous-comment
+
      
+This matches the comments containing the previous untranslated string (entire
+lines).
+
+
      .previous
+
      
+This matches the previous untranslated string including the string delimiters,
+the associated keywords (msgid etc.) and the spaces between them.
+
+
      .msgid
+
      
+This matches the untranslated string including the string delimiters,
+the associated keywords (msgid etc.) and the spaces between them.
+
+
      .msgstr
+
      
+This matches the translated string including the string delimiters,
+the associated keywords (msgstr etc.) and the spaces between them.
+
+
      .keyword
+
      
+This matches the keywords (msgid, msgstr, etc.).
+
+
      .string
+
      
+This matches strings, including the string delimiters (double quotes).
+
      
+
+
    • 
+
+Selectors that apply to parts of strings:
+
+
      
+
+
      .text
+
      
+This matches the entire contents of a string (excluding the string delimiters,
+i.e. the double quotes).
+
+
      .escape-sequence
+
      
+This matches an escape sequence (starting with a backslash).
+
+
      .format-directive
+
      
+This matches a format string directive (starting with a ‘%’ sign in the
+case of most programming languages, with a ‘{’ in the case of
+java-format and csharp-format, with a ‘~’ in the case of
+lisp-format and scheme-format, or with ‘$’ in the case of
+sh-format).
+
+
      .invalid-format-directive
+
      
+This matches an invalid format string directive.
+
+
      .added
+
      
+In an untranslated string, this matches a part of the string that was not
+present in the previous untranslated string.  (Not yet implemented in this
+release.)
+
+
      .changed
+
      
+In an untranslated string or in a previous untranslated string, this matches
+a part of the string that is changed or replaced.  (Not yet implemented in
+this release.)
+
+
      .removed
+
      
+In a previous untranslated string, this matches a part of the string that
+is not present in the current untranslated string.  (Not yet implemented in
+this release.)
+
      
+
    
+
+
    
+These selectors can be combined to hierarchical selectors.  For example,
+
+
    
+
+
    +.msgstr .invalid-format-directive { color: red; }
+
    
+
+
    
+will highlight the invalid format directives in the translated strings.
+
+
    
+
    
+In text mode, pseudo-classes (CSS2 spec, section 5.11) and pseudo-elements
+(CSS2 spec, section 5.12) are not supported.
+
+
    
+
    
+The declarations in HTML mode are not limited; any graphical attribute
+supported by the browsers can be used.
+
+
    
+
    
+The declarations in text mode are limited to the following properties.  Other
+properties will be silently ignored.
+
+
    
+
    
+
+
    color (CSS2 spec, section 14.1)
+
    
+
    background-color (CSS2 spec, section 14.2.1)
+
    
+These properties is supported.  Colors will be adjusted to match the terminal's
+capabilities.  Note that many terminals support only 8 colors.
+
+
    font-weight (CSS2 spec, section 15.2.3)
+
    
+This property is supported, but most terminals can only render two different
+weights: normal and bold.  Values >= 600 are rendered as
+bold.
+
+
    font-style (CSS2 spec, section 15.2.3)
+
    
+This property is supported.  The values italic and oblique are
+rendered the same way.
+
+
    text-decoration (CSS2 spec, section 16.3.1)
+
    
+This property is supported, limited to the values none and
+underline.
+
    
+
+
+
+
    9.11.5  Customizing less for viewing PO files
    
+
+
    
+The ‘less’ program is a popular text file browser for use in a text
+screen or terminal emulator.  It also supports text with embedded escape
+sequences for colors and text decorations.
+
+
    
+
    
+You can use less to view a PO file like this (assuming an UTF-8
+environment):
+
+
    
+
+
    +msgcat --to-code=UTF-8 --color xyz.po | less -R
+
    
+
+
    
+You can simplify this to this simple command:
+
+
    
+
+
    +less xyz.po
+
    
+
+
    
+after these three preparations:
+
+
    
+
+
      
+
    1. 
+
+Add the options ‘-R’ and ‘-f’ to the LESS environment
+variable.  In sh shells:
+
+
      +$ LESS="$LESS -R -f"
+$ export LESS
+
      
+
+
    2. 
+
+If your system does not already have the ‘lessopen.sh’ and
+‘lessclose.sh’ scripts, create them and set the LESSOPEN and
+LESSCLOSE environment variables, as indicated in the manual page
+(‘man less’).
+
+
    3. 
+
+Add to ‘lessopen.sh’ a piece of script that recognizes PO files
+through their file extension and invokes msgcat on them, producing
+a temporary file.  Like this:
+
+
+
      +case "$1" in
+  *.po)
+    tmpfile=`mktemp "${TMPDIR-/tmp}/less.XXXXXX"`
+    msgcat --to-code=UTF-8 --color "$1" > "$tmpfile"
+    echo "$tmpfile"
+    exit 0
+    ;;
+esac
+
      
+
+
    
+
+
+
+
    9.12  Writing your own programs that process PO files
    
 
 
    
 For the tasks for which a combination of ‘msgattrib’, ‘msgcat’ etc.
@@ -2560,7 +3159,7 @@ defined in a library called ‘libgettextpo’.
 
    
 
    
 
    Data Type: po_file_t
-
    
+
    
 This is a pointer type that refers to the contents of a PO file, after it has
 been read into memory.
 
    
@@ -2569,7 +3168,7 @@ been read into memory.
 
    
 
    
 
    Data Type: po_message_iterator_t
-
    
+
    
 This is a pointer type that refers to an iterator that produces a sequence of
 messages.
 
    
@@ -2578,7 +3177,7 @@ messages.
 
    
 
    
 
    Data Type: po_message_t
-
    
+
    
 This is a pointer type that refers to a message of a PO file, including its
 translation.
 
    
@@ -2587,7 +3186,7 @@ translation.
 
    
 
    
 
    Function: po_file_t po_file_read (const char *filename)
-
    
+
    
 The po_file_read function reads a PO file into memory.  The file name
 is given as argument.  The return value is a handle to the PO file's contents,
 valid until po_file_free is called on it.  In case of error, the return
@@ -2598,7 +3197,7 @@ value is NULL, and errno is set.
 
    
 
    
 
    Function: void po_file_free (po_file_t file)
-
    
+
    
 The po_file_free function frees a PO file's contents from memory,
 including all messages that are only implicitly accessible through iterators.
 
    
@@ -2607,7 +3206,7 @@ including all messages that are only implicitly accessible through iterators.
 
    
 
    
 
    Function: const char * const * po_file_domains (po_file_t file)
-
    
+
    
 The po_file_domains function returns the domains for which the given
 PO file has messages.  The return value is a NULL terminated array
 which is valid as long as the file handle is valid.  For PO files which
@@ -2619,7 +3218,7 @@ namely the default domain "messages".
 
    
 
    
 
    Function: po_message_iterator_t po_message_iterator (po_file_t file, const char *domain)
-
    
+
    
 The po_message_iterator returns an iterator that will produce the
 messages of file that belong to the given domain.  If domain
 is NULL, the default domain is used instead.  To list the messages,
@@ -2630,7 +3229,7 @@ use the function po_next_message repeatedly.
 
    
 
    
 
    Function: void po_message_iterator_free (po_message_iterator_t iterator)
-
    
+
    
 The po_message_iterator_free function frees an iterator previously
 allocated through the po_message_iterator function.
 
    
@@ -2639,7 +3238,7 @@ allocated through the po_message_iterator function.
 
    
 
    
 
    Function: po_message_t po_next_message (po_message_iterator_t iterator)
-
    
+
    
 The po_next_message function returns the next message from
 iterator and advances the iterator.  It returns NULL when the
 iterator has reached the end of its message list.
@@ -2654,7 +3253,7 @@ that the results are valid as long as the file handle is valid.
 
    
 
    
 
    Function: const char * po_message_msgid (po_message_t message)
-
    
+
    
 The po_message_msgid function returns the msgid (untranslated
 English string) of a message.  This is guaranteed to be non-NULL.
 
    
@@ -2663,7 +3262,7 @@ English string) of a message.  This is guaranteed to be non-NULL.
 
    
 
    
 
    Function: const char * po_message_msgid_plural (po_message_t message)
-
    
+
    
 The po_message_msgid_plural function returns the msgid_plural
 (untranslated English plural string) of a message with plurals, or NULL
 for a message without plural.
@@ -2673,7 +3272,7 @@ for a message without plural.
 
    
 
    
 
    Function: const char * po_message_msgstr (po_message_t message)
-
    
+
    
 The po_message_msgstr function returns the msgstr (translation)
 of a message.  For an untranslated message, the return value is an empty
 string.
@@ -2683,7 +3282,7 @@ string.
 
    
 
    
 
    Function: const char * po_message_msgstr_plural (po_message_t message, int index)
-
    
+
    
 The po_message_msgstr_plural function returns the
 msgstr[index] of a message with plurals, or NULL when
 the index is out of range or for a message without plural.
diff --git a/gettext-tools/doc/gettext_foot.html b/gettext-tools/doc/gettext_foot.html
index 72a0b7b18..01a1dfec0 100644
--- a/gettext-tools/doc/gettext_foot.html
+++ b/gettext-tools/doc/gettext_foot.html
@@ -1,15 +1,15 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - Footnotes
 
 
-
    GNU gettext tools, version 0.16
    
+
    GNU gettext tools, version 0.17
    
 
    Native Language Support Library and Tools
    
-
    Edition 0.16, 20 October 2006
    
+
    Edition 0.17, 31 October 2007
    
 
    Ulrich Drepper
    
 
    Jim Meyering
    
 
    François Pinard
    
@@ -26,7 +26,7 @@ limitation is not imposed by GNU gettext, but is for compatibility
 with the msgfmt implementation on Solaris.
 
    (3)
    
 
    Some
-system, eg Ultrix, don't have LC_MESSAGES.  Here we use a more or
+system, e.g. mingw, don't have LC_MESSAGES.  Here we use a more or
 less arbitrary value for it, namely 1729, the smallest positive integer
 which can be represented in two different ways as the sum of two cubes.
 
    (4)
    
@@ -37,7 +37,7 @@ variables.
 
    Additions are welcome.  Send appropriate information to
 bug-gnu-gettext@gnu.org and bug-glibc-manual@gnu.org.
 
    
-This document was generated on 25 October 2006 using the
+This document was generated on 4 November 2007 using the
 texi2html
 translator version 1.52b.
    
 
diff --git a/gettext-tools/doc/gettext_toc.html b/gettext-tools/doc/gettext_toc.html
index 321f18d0d..9b9f430ad 100644
--- a/gettext-tools/doc/gettext_toc.html
+++ b/gettext-tools/doc/gettext_toc.html
@@ -1,15 +1,15 @@
 
 
 
+     from gettext.texi on 4 November 2007 -->
 
 
 GNU gettext utilities - Table of Contents
 
 
-
    GNU gettext tools, version 0.16
    
+
    GNU gettext tools, version 0.17
    
 
    Native Language Support Library and Tools
    
-
    Edition 0.16, 20 October 2006
    
+
    Edition 0.17, 31 October 2007
    
 
    Ulrich Drepper
    
 
    Jim Meyering
    
 
    François Pinard
    
@@ -27,416 +27,440 @@
 
 
  • 2  The User's View
 
+
  • 3  The Format of PO Files
+
  • 4  Preparing Program Sources
+
+
  • 5  Making the PO Template File
+
+
  • 6  Creating a New PO File
+
+
  • 7  Updating Existing PO Files
+
+
  • 8  Editing PO Files
+
-
  • 8  Editing PO Files
-
      
-
    • 8.1  KDE's PO File Editor
-
    • 8.2  GNOME's PO File Editor
-
    • 8.3  Emacs's PO File Editor
-
 
      
-This document was generated on 25 October 2006 using the
+This document was generated on 4 November 2007 using the
 texi2html
 translator version 1.52b.
      
 
diff --git a/gettext-tools/doc/version.texi b/gettext-tools/doc/version.texi
index 48027854e..f40d70ec1 100644
--- a/gettext-tools/doc/version.texi
+++ b/gettext-tools/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 20 October 2006
-@set UPDATED-MONTH October 2006
-@set EDITION 0.16
-@set VERSION 0.16
+@set UPDATED 31 October 2007
+@set UPDATED-MONTH October 2007
+@set EDITION 0.17
+@set VERSION 0.17
diff --git a/gettext-tools/examples/po/af.po b/gettext-tools/examples/po/af.po
index d2d57e8f2..dc6d8a2d8 100644
--- a/gettext-tools/examples/po/af.po
+++ b/gettext-tools/examples/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2003-12-31 10:30+2\n"
 "Last-Translator: Ysbeer \n"
 "Language-Team: Afrikaans \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hallo wêreld!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Hierdie program loop as prosesnommer %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Hierdie program loop as prosesnommer %1."
@@ -57,29 +58,29 @@ msgstr "Hallo voorbeeld"
 msgid "Hello world example"
 msgstr "Hallo wêreld voorbeeld"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Hierdie program loop as prosesnommer $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Hierdie program loop as prosesnommer %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Hierdie program loop as prosesnommer ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Hierdie program loop as prosesnommer {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Hierdie program loop as prosesnommer {pid}"
diff --git a/gettext-tools/examples/po/ca.po b/gettext-tools/examples/po/ca.po
index dfe12bc47..5ae92af50 100644
--- a/gettext-tools/examples/po/ca.po
+++ b/gettext-tools/examples/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2003-12-18 10:41+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer \n"
 "Language-Team: Catalan \n"
@@ -16,36 +16,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hola, món!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Aquest programa està corrent amb el número de procés %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Aquest programa està corrent amb el número de procés %1."
@@ -58,29 +59,29 @@ msgstr "Exemple Hola"
 msgid "Hello world example"
 msgstr "Exemple Hola Món"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Aquest programa està corrent amb el número de procés $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Aquest programa està corrent amb el número de procés %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Aquest programa està corrent amb el número de procés ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Aquest programa està corrent amb el número de procés {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Aquest programa està corrent amb el número de procés {pid}."
diff --git a/gettext-tools/examples/po/de.po b/gettext-tools/examples/po/de.po
index e2ffaa5c5..e3042cd7d 100644
--- a/gettext-tools/examples/po/de.po
+++ b/gettext-tools/examples/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2003-12-18 10:09+0100\n"
 "Last-Translator: Karl Eichwalder \n"
 "Language-Team: German \n"
@@ -17,36 +17,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hallo Welt!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Dieses Programm läuft mit der Prozess-Nummer %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Dieses Programm läuft mit der Prozess-Nummer %1."
@@ -59,29 +60,29 @@ msgstr "Beispiel Hallo"
 msgid "Hello world example"
 msgstr "Beispiel Hallo-Welt"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Dieses Programm läuft mit der Prozess-Nummer $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Dieses Programm läuft mit der Prozess-Nummer %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Dieses Programm läuft mit der Prozess-Nummer ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Dieses Programm läuft mit der Prozess-Nummer {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Dieses Programm läuft mit der Prozeß-Nummer {pid}."
diff --git a/gettext-tools/examples/po/el.po b/gettext-tools/examples/po/el.po
index 08bd5e36c..adc193627 100644
--- a/gettext-tools/examples/po/el.po
+++ b/gettext-tools/examples/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2005-01-06 18:50+0000\n"
 "Last-Translator: Simos Xenitellis \n"
 "Language-Team: Greek \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Γεια σου, κόσμε!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %1."
@@ -57,29 +58,29 @@ msgstr "Παράδειγμα χαιρετισμού"
 msgid "Hello world example"
 msgstr "Παράδειγμα \"γεια σου κόσμε\""
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας {pid}."
diff --git a/gettext-tools/examples/po/eo.po b/gettext-tools/examples/po/eo.po
index 41cf35422..8fd032de4 100644
--- a/gettext-tools/examples/po/eo.po
+++ b/gettext-tools/examples/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2006-07-02 19:24+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS \n"
 "Language-Team: Esperanto \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Saluton, mondo!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero %1."
@@ -57,29 +58,29 @@ msgstr "Saluto-ekzemplo"
 msgid "Hello world example"
 msgstr "Saluton-mondo-ekzemplo"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero {pid}."
diff --git a/gettext-tools/examples/po/es.po b/gettext-tools/examples/po/es.po
index 6f9d9e42f..8849cbee2 100644
--- a/gettext-tools/examples/po/es.po
+++ b/gettext-tools/examples/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2004-01-29 13:59-0600\n"
 "Last-Translator: Max de Mendizábal \n"
 "Language-Team: Spanish \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "¡Hola, mundo!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Este programa está corriendo como el proceso número %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Este programa está corriendo como el proceso número %1."
@@ -57,29 +58,29 @@ msgstr "Hola ejemplo"
 msgid "Hello world example"
 msgstr "Ejemplo de hola mundo"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Este programa está corriendo como el proceso número $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Este programa está corriendo como el proceso número %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Este programa está corriendo como el proceso número ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Este programa está corriendo como el proceso número {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Este programa está corriendo como el proceso número {pid}."
diff --git a/gettext-tools/examples/po/fr.po b/gettext-tools/examples/po/fr.po
index 9f2ddc33d..93bd874e9 100644
--- a/gettext-tools/examples/po/fr.po
+++ b/gettext-tools/examples/po/fr.po
@@ -2,12 +2,12 @@
 # Copyright © 2006 Yoyodyne, Inc.
 # Michel Robitaille , 2006.
 # Christophe Combelles , 2006
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2006-10-01 02:29+0200\n"
 "Last-Translator: Christophe Combelles \n"
 "Language-Team: French \n"
@@ -16,36 +16,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Bonjour, le monde !"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ce programme est exécuté en tant que processus numéro %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Ce programme est exécuté en tant que processus numéro %1."
@@ -58,29 +59,29 @@ msgstr "Exemple Hello"
 msgid "Hello world example"
 msgstr "Exemple de « Hello world »"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Ce programme est exécuté en tant que processus numéro $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Ce programme est exécuté en tant que processus numéro %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Ce programme est exécuté en tant que processus numéro ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Ce programme est exécuté en tant que processus numéro {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Ce programme est exécuté en tant que processus numéro {pid}."
diff --git a/gettext-tools/examples/po/ga.po b/gettext-tools/examples/po/ga.po
index 6b02a428a..a772c682d 100644
--- a/gettext-tools/examples/po/ga.po
+++ b/gettext-tools/examples/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2005-02-07 12:09-0500\n"
 "Last-Translator: Kevin Patrick Scannell \n"
 "Language-Team: Irish \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Dia duit, a dhomhain!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Tá an clár seo á rith mar phróiseas %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Tá an clár seo á rith mar phróiseas %1."
@@ -57,29 +58,29 @@ msgstr "Sampla `Dia duit'"
 msgid "Hello world example"
 msgstr "Sampla `Dia duit a dhomhain'"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Tá an clár seo á rith mar phróiseas $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Tá an clár seo á rith mar phróiseas %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Tá an clár seo á rith mar phróiseas ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Tá an clár seo á rith mar phróiseas {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Tá an clár seo á rith mar phróiseas {pid}."
diff --git a/gettext-tools/examples/po/gettext-examples.pot b/gettext-tools/examples/po/gettext-examples.pot
index 45a0cd2e9..f0eb6dd74 100644
--- a/gettext-tools/examples/po/gettext-examples.pot
+++ b/gettext-tools/examples/po/gettext-examples.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -16,36 +16,37 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr ""
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr ""
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr ""
@@ -58,29 +59,29 @@ msgstr ""
 msgid "Hello world example"
 msgstr ""
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr ""
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr ""
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr ""
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr ""
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr ""
diff --git a/gettext-tools/examples/po/hu.po b/gettext-tools/examples/po/hu.po
index 5a3d5180f..f72ac6d39 100644
--- a/gettext-tools/examples/po/hu.po
+++ b/gettext-tools/examples/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2005-08-28 03:21+0200\n"
 "Last-Translator: Kiss Tamás \n"
 "Language-Team: Hungarian \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hello, világ!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ez a program a %d processz azonosítóval fut."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Ez a program a %1 processz azonosítóval fut."
@@ -57,29 +58,29 @@ msgstr "Hello p
 msgid "Hello world example"
 msgstr "Hello világ példa"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Ez a program a $pid processz azonosítóval fut."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Ez a program a %(pid)d processz azonosítóval fut."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Ez a program a ~D processz azonosítóval fut."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Ez a program a {0} processz azonosítóval fut."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Ez a program a {pid} processz azonosítóval fut."
diff --git a/gettext-tools/examples/po/id.po b/gettext-tools/examples/po/id.po
index 646227737..bea2aca7e 100644
--- a/gettext-tools/examples/po/id.po
+++ b/gettext-tools/examples/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2006-09-27 20:19+0700\n"
 "Last-Translator: Tedi Heriyanto \n"
 "Language-Team: Indonesian \n"
@@ -16,36 +16,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hello, world!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Program ini berjalan sebagai proses nomor %d"
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Program ini berjalan sebagai proses nomor %1"
@@ -58,29 +59,29 @@ msgstr "Contoh hello"
 msgid "Hello world example"
 msgstr "Contoh hello world"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Program ini berjalan sebagai proses nomor $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Program ini berjalan sebagai proses nomor %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Program ini berjalan sebagai proses nomor  ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Program ini berjalan sebagai proses nomor {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Program ini berjalan sebagai proses nomor {pid}."
diff --git a/gettext-tools/examples/po/it.po b/gettext-tools/examples/po/it.po
index 069a98d5a..0c0721ec5 100644
--- a/gettext-tools/examples/po/it.po
+++ b/gettext-tools/examples/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2006-07-01 10:46+0100\n"
 "Last-Translator: Marco Colombo \n"
 "Language-Team: Italian \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Salve, mondo!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Questo programma è in esecuzione con numero di processo %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Questo programma è in esecuzione con numero di processo %1."
@@ -57,29 +58,29 @@ msgstr "Esempio di Salve mondo"
 msgid "Hello world example"
 msgstr "Esempio di Salve mondo"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Questo programma è in esecuzione con numero di processo $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Questo programma è in esecuzione con numero di processo %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Questo programma è in esecuzione con numero di processo ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Questo programma è in esecuzione con numero di processo {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Questo programma è in esecuzione con numero di processo {pid}."
diff --git a/gettext-tools/examples/po/ms.po b/gettext-tools/examples/po/ms.po
index 56d0daece..aca7ed12a 100644
--- a/gettext-tools/examples/po/ms.po
+++ b/gettext-tools/examples/po/ms.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2006-12-22 21:36+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan \n"
 "Language-Team: Malay \n"
@@ -16,36 +16,37 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hello, world!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Program ini dilaksanakan sebagai proses bernombor %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Program ini dilaksanakan sebagai proses bernombor %1."
@@ -58,29 +59,29 @@ msgstr "Contoh hello"
 msgid "Hello world example"
 msgstr "Contoh hello world"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Program ini dilaksanakan sebagai proses bernombor $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Program ini dilaksanakan sebagai proses bernombor %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Program ini dilaksanakan sebagai proses bernombor ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Program ini dilaksanakan sebagai proses bernombor {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Program ini dilaksanakan sebagai proses bernombor {pid}."
diff --git a/gettext-tools/examples/po/pl.po b/gettext-tools/examples/po/pl.po
index f2700a936..fbb62d5d5 100644
--- a/gettext-tools/examples/po/pl.po
+++ b/gettext-tools/examples/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2003-12-18 12:00+0100\n"
 "Last-Translator: Rafa³ Maszkowski \n"
 "Language-Team: Polish \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Witaj ¶wiecie!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ten program dzia³a jako proces o numerze %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Ten program dzia³a jako proces o numerze %1."
@@ -57,29 +58,29 @@ msgstr "Przyk
 msgid "Hello world example"
 msgstr "Przyk³adowy program witaj±cy ¶wiat"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Ten program dzia³a jako proces o numerze $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Ten program dzia³a jako proces o numerze %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Ten program dzia³a jako proces o numerze ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Ten program dzia³a jako proces o numerze {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Ten program dzia³a jako proces o numerze {pid}."
diff --git a/gettext-tools/examples/po/pt.po b/gettext-tools/examples/po/pt.po
index 517f37df1..49eb3f902 100644
--- a/gettext-tools/examples/po/pt.po
+++ b/gettext-tools/examples/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2005-11-19 23:08+0000\n"
 "Last-Translator: Helder Correia \n"
 "Language-Team: Portuguese \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Olá, Mundo!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Este programa está a ser executado com o número de processo %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Este programa está a ser executado com o número de processo %1."
@@ -57,29 +58,29 @@ msgstr "Exemplo Olá"
 msgid "Hello world example"
 msgstr "Exemplo Olá Mundo"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Este process está a ser executado com o número de processo $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Este programa está a ser executado com o número de processo %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Este programa está a ser executado com o número de processo ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Este programa está a ser executado com o número de processo {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Este programa está a ser executado com o número de processo {pid}."
diff --git a/gettext-tools/examples/po/ro.po b/gettext-tools/examples/po/ro.po
index 943590794..279413a6a 100644
--- a/gettext-tools/examples/po/ro.po
+++ b/gettext-tools/examples/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2003-11-22 11:15+0200\n"
 "Last-Translator: Eugen Hoanca \n"
 "Language-Team: Romanian \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Salut, lume! (Hello, world!)"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Acest program este rulat ca procesul numãrul %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Acest program este rulat ca procesul numãrul %1."
@@ -57,29 +58,29 @@ msgstr "Exemplu Salut(Hello)"
 msgid "Hello world example"
 msgstr "Exemplu Salut lume(Hello world)"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Acest program ruleazã ca procesul numãrul $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Acest program este rulat ca procesul numãrul %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Acest program este rulat ca procesul numãrul ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Acest program este rulat ca procesul numãrul {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, fuzzy, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Acest program ruleazã ca procesul numãrul $pid."
diff --git a/gettext-tools/examples/po/ru.po b/gettext-tools/examples/po/ru.po
index 2ca3d19a1..f26461716 100644
--- a/gettext-tools/examples/po/ru.po
+++ b/gettext-tools/examples/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2004-11-17 10:08+0200\n"
 "Last-Translator: Pavel Maryanov \n"
 "Language-Team: Russian \n"
@@ -17,36 +17,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "úÄÒÁ×ÓÔ×ÕÊ, ÍÉÒ!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "üÔÁ ÐÒÏÇÒÁÍÍÁ ×ÙÐÏÌÎÑÅÔÓÑ ËÁË ÐÒÏÃÅÓÓ ÐÏÄ ÎÏÍÅÒÏÍ %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "üÔÁ ÐÒÏÇÒÁÍÍÁ ×ÙÐÏÌÎÑÅÔÓÑ ËÁË ÐÒÏÃÅÓÓ ÐÏÄ ÎÏÍÅÒÏÍ %1."
@@ -59,29 +60,29 @@ msgstr "
 msgid "Hello world example"
 msgstr "ðÒÉÍÅÒ: úÄÒÁ×ÓÔ×ÕÊ, ÍÉÒ"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "üÔÁ ÐÒÏÇÒÁÍÍÁ ×ÙÐÏÌÎÑÅÔÓÑ ËÁË ÐÒÏÃÅÓÓ ÐÏÄ ÎÏÍÅÒÏÍ $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "üÔÁ ÐÒÏÇÒÁÍÍÁ ×ÙÐÏÌÎÑÅÔÓÑ ËÁË ÐÒÏÃÅÓÓ ÐÏÄ ÎÏÍÅÒÏÍ %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "üÔÁ ÐÒÏÇÒÁÍÍÁ ×ÙÐÏÌÎÑÅÔÓÑ ËÁË ÐÒÏÃÅÓÓ ÐÏÄ ÎÏÍÅÒÏÍ ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "üÔÁ ÐÒÏÇÒÁÍÍÁ ×ÙÐÏÌÎÑÅÔÓÑ ËÁË ÐÒÏÃÅÓÓ ÐÏÄ ÎÏÍÅÒÏÍ {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "üÔÁ ÐÒÏÇÒÁÍÍÁ ×ÙÐÏÌÎÑÅÔÓÑ ËÁË ÐÒÏÃÅÓÓ ÐÏÄ ÎÏÍÅÒÏÍ {pid}."
diff --git a/gettext-tools/examples/po/sk.po b/gettext-tools/examples/po/sk.po
index 4097e328d..014b1be40 100644
--- a/gettext-tools/examples/po/sk.po
+++ b/gettext-tools/examples/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2004-01-22 00:19+0100\n"
 "Last-Translator: Marcel Telka \n"
 "Language-Team: Slovak \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Ahoj svet!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Tento program beží ako proces s číslom %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Tento program beží ako proces s číslom %1."
@@ -57,29 +58,29 @@ msgstr "Príklad \"Ahoj\""
 msgid "Hello world example"
 msgstr "Príklad \"Ahoj svet\""
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Tento program beží ako proces s číslom $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Tento program beží ako proces s číslom %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Tento program beží ako proces s číslom ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Tento program beží ako proces s číslom {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Tento program beží ako proces s číslom {pid}."
diff --git a/gettext-tools/examples/po/sl.po b/gettext-tools/examples/po/sl.po
index 4cc1aee98..25b063a98 100644
--- a/gettext-tools/examples/po/sl.po
+++ b/gettext-tools/examples/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU gettext-example
 # Copyright (C) 2005 Yoyodyne, Inc.
 # Primož Peterlin , 2005.
-# $Id: sl.po,v 1.2 2006/04/20 14:10:34 haible Exp $
+# $Id: sl.po,v 1.3 2007/11/07 00:46:46 haible Exp $
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2005-09-29 13:38+0200\n"
 "Last-Translator: Primož Peterlin \n"
 "Language-Team: Slovenian \n"
@@ -16,36 +16,37 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Pozdravljen, svet!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ta program teče kot proces številka %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Ta program teče kot proces številka %1."
@@ -58,29 +59,29 @@ msgstr "Zgled Pozdravljen"
 msgid "Hello world example"
 msgstr "Zgled Pozdravljen svet"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Ta program teče kot proces številka $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Ta program teče kot proces številka %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Ta program teče kot proces številka ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Ta program teče kot proces številka {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Ta program teče kot proces številka {pid}."
diff --git a/gettext-tools/examples/po/sr.po b/gettext-tools/examples/po/sr.po
index 38804ba8e..fc6536e08 100644
--- a/gettext-tools/examples/po/sr.po
+++ b/gettext-tools/examples/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2004-01-31 00:47-0500\n"
 "Last-Translator: Aleksandar Jelenak \n"
 "Language-Team: Serbian \n"
@@ -14,36 +14,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Здраво свима!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Овај програм се извршава као процес број %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Овај програм се извршава као процес број %1."
@@ -56,29 +57,29 @@ msgstr "„Здраво“ пример"
 msgid "Hello world example"
 msgstr "„Здраво свима“ пример"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Овај програм се извршава као процес број $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Овај програм се извршава као процес број %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Овај програм се извршава као процес број ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Овај програм се извршава као процес број {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Овај програм се извршава као процес број {pid}."
diff --git a/gettext-tools/examples/po/sv.po b/gettext-tools/examples/po/sv.po
index 641288094..cb8b3ca46 100644
--- a/gettext-tools/examples/po/sv.po
+++ b/gettext-tools/examples/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2006-07-04 12:39+0200\n"
 "Last-Translator: Jan Djärv \n"
 "Language-Team: Swedish \n"
@@ -14,36 +14,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Hej världen!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Detta program kör som process nummer %d."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Detta program kör som process nummer %1."
@@ -56,29 +57,29 @@ msgstr "Hälsningsexempel"
 msgid "Hello world example"
 msgstr "\"Hej världen\"-exempel"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Detta program kör som process nummer $pid."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Detta program kör som process nummer %(pid)d."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Detta program kör som process nummer ~D."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Detta program kör som process nummer {0}."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Detta program kör som process nummer {pid}."
diff --git a/gettext-tools/examples/po/tr.po b/gettext-tools/examples/po/tr.po
index 3e4bb836f..26657a349 100644
--- a/gettext-tools/examples/po/tr.po
+++ b/gettext-tools/examples/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2004-01-21 06:17+0300\n"
 "Last-Translator: Nilgün Belma Bugüner \n"
 "Language-Team: Turkish \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "Merhaba Dünyalı!"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Bu yazılım, %d süreç kimliği ile çalışıyor."
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Bu yazılım, %1 süreç kimliği ile çalışıyor."
@@ -57,29 +58,29 @@ msgstr "Hello örneği"
 msgid "Hello world example"
 msgstr "Hello world örneği"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Bu yazılım, $pid süreç kimliği ile çalışıyor."
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Bu yazılım, %(pid)d süreç kimliği ile çalışıyor."
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Bu yazılım, ~D süreç kimliği ile çalışıyor."
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Bu yazılım, {0} süreç kimliği ile çalışıyor."
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Bu yazılım, {pid} süreç kimliği ile çalışıyor."
diff --git a/gettext-tools/examples/po/uk.po b/gettext-tools/examples/po/uk.po
index 35973cb1d..a1d118f33 100644
--- a/gettext-tools/examples/po/uk.po
+++ b/gettext-tools/examples/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-05-13 22:04+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2007-07-05 20:24+0200\n"
 "Last-Translator: Maxim V. Dziumanenko \n"
 "Language-Team: Ukrainian \n"
@@ -24,9 +24,10 @@ msgstr ""
 #: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
 #: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
 #: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
-#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
-#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
 #: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
 #: hello-php/hello.php:12
 msgid "Hello, world!"
@@ -73,8 +74,8 @@ msgid "This program is running as process number ~D."
 msgstr "Ця програма виконується як процес з номером ~D."
 
 #: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
-#: hello-java-swing/Hello.java:25 hello-csharp/hello.cs:17
-#: hello-csharp-forms/hello.cs:36
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Ця програма виконується як процес з номером {0}."
diff --git a/gettext-tools/examples/po/vi.po b/gettext-tools/examples/po/vi.po
index d9c224fb5..5a62cf203 100644
--- a/gettext-tools/examples/po/vi.po
+++ b/gettext-tools/examples/po/vi.po
@@ -2,7 +2,7 @@
 # Copyright © 2005 Yoyodyne, Inc.
 # Copyright © 2007 Free Software Foundation, Inc.
 # Clytie Siddall , 2005-2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.16.2-pre5\n"
diff --git a/gettext-tools/examples/po/zh_CN.po b/gettext-tools/examples/po/zh_CN.po
index 7301f574b..575c8cde7 100644
--- a/gettext-tools/examples/po/zh_CN.po
+++ b/gettext-tools/examples/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang \n"
 "Language-Team: Chinese (simplified) \n"
@@ -15,36 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "世界你好！"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "此程序正以进程号 %d 运行。"
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "此程序正以进程号 %1 运行。"
@@ -57,29 +58,29 @@ msgstr "世界你好示例"
 msgid "Hello world example"
 msgstr "世界你好示例"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "此程序正以进程号 $pid 运行。"
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "此程序正以进程号 %(pid)d 运行。"
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "此程序正以进程号 ~D 运行。"
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "此程序正以进程号 {0} 运行。"
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "此程序正以进程号 {pid} 运行。"
diff --git a/gettext-tools/examples/po/zh_HK.po b/gettext-tools/examples/po/zh_HK.po
index 499a7937d..e4f6e4a82 100644
--- a/gettext-tools/examples/po/zh_HK.po
+++ b/gettext-tools/examples/po/zh_HK.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2006-07-05 15:40+0800\n"
 "Last-Translator: Abel Cheung \n"
 "Language-Team: Chinese (Hong Kong) \n"
@@ -14,36 +14,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "你好！"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "本程式正在執行中，進程編號為 %d。"
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "本程式正在執行中，進程編號為 %1。"
@@ -56,29 +57,29 @@ msgstr "測試範例"
 msgid "Hello world example"
 msgstr "訊息測試範例"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "本程式正在執行中，進程編號為 $pid。"
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "本程式正在執行中，進程編號為 %(pid)d。"
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "本程式正在執行中，進程編號為 ~D。"
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "本程式正在執行中，進程編號為 {0}。"
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "本程式正在執行中，進程編號為 {pid}。"
diff --git a/gettext-tools/examples/po/zh_TW.po b/gettext-tools/examples/po/zh_TW.po
index e9f53f543..8b3edbfe4 100644
--- a/gettext-tools/examples/po/zh_TW.po
+++ b/gettext-tools/examples/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-04-20 15:53+0200\n"
+"POT-Creation-Date: 2007-10-18 03:08+0200\n"
 "PO-Revision-Date: 2005-08-10 12:25+0800\n"
 "Last-Translator: Abel Cheung \n"
 "Language-Team: Chinese (traditional) \n"
@@ -14,36 +14,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-c++-wxwidgets/hello.cc:69
-#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:50
-#: hello-objc-gnome/hello.m:48 hello-sh/hello.sh:15
-#: hello-python/hello.py.in:13 hello-clisp/hello.lisp.in:12
-#: hello-librep/hello.jl.in:13 hello-guile/hello.scm:16
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-csharp/hello.cs:15 hello-csharp-forms/hello.cs:30
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
+#: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
+#: hello-c++-gnome/hello.cc:50 hello-c++-wxwidgets/hello.cc:68
+#: hello-objc/hello.m:30 hello-objc-gnustep/Hello.m:49
+#: hello-objc-gnome/hello.m:47 hello-sh/hello.sh:14
+#: hello-python/hello.py.in:12 hello-clisp/hello.lisp.in:11
+#: hello-librep/hello.jl.in:12 hello-guile/hello.scm:15
+#: hello-smalltalk/hello.st.in:31 hello-java/Hello.java:14
+#: hello-java-awt/Hello.java:23 hello-java-swing/Hello.java:20
+#: hello-java-qtjambi/Hello.java:27 hello-csharp/hello.cs:14
+#: hello-csharp-forms/hello.cs:29 hello-gawk/hello.awk:11
+#: hello-pascal/hello.hello_world hello-ycp/hello.ycp:15
+#: hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
 msgid "Hello, world!"
 msgstr "您好！"
 
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-c++-wxwidgets/hello.cc:72
-#: hello-objc/hello.m:32 hello-objc-gnustep/Hello.m:59
-#: hello-objc-gnome/hello.m:53 hello-librep/hello.jl.in:15
-#: hello-gawk/hello.awk:13 hello-pascal/hello.running_as
-#: hello-tcl/hello.tcl:13 hello-tcl-tk/hello.tcl:17
-#: hello-perl/hello-1.pl.in:20 hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c++/hello.cc:40
+#: hello-c++-gnome/hello.cc:55 hello-c++-wxwidgets/hello.cc:71
+#: hello-objc/hello.m:31 hello-objc-gnustep/Hello.m:58
+#: hello-objc-gnome/hello.m:52 hello-librep/hello.jl.in:14
+#: hello-gawk/hello.awk:12 hello-pascal/hello.running_as
+#: hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:16
+#: hello-perl/hello-1.pl.in:19 hello-php/hello.php:14
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "本程式正在執行中，進程編號為 %d。"
 
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "本程式正在執行中，進程編號為 %1。"
@@ -56,29 +57,29 @@ msgstr "測試範例"
 msgid "Hello world example"
 msgstr "訊息測試範例"
 
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "本程式正在執行中，進程編號為 $pid。"
 
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "本程式正在執行中，進程編號為 %(pid)d。"
 
-#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "本程式正在執行中，進程編號為 ~D。"
 
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:18
-#: hello-csharp-forms/hello.cs:37
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "本程式正在執行中，進程編號為 {0}。"
 
-#: hello-perl/hello-2.pl.in:15
+#: hello-perl/hello-2.pl.in:14
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "本程式正在執行中，進程編號為 {pid}。"
diff --git a/gettext-tools/man/autopoint.1 b/gettext-tools/man/autopoint.1
index bdbfe72ff..8a927d4b2 100644
--- a/gettext-tools/man/autopoint.1
+++ b/gettext-tools/man/autopoint.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOPOINT "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH AUTOPOINT "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 autopoint \- copies standard gettext infrastructure
 .SH SYNOPSIS
@@ -27,10 +27,11 @@ Written by Bruno Haible
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 2002-2006 Free Software Foundation, Inc.
+Copyright \(co 2002-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B autopoint
diff --git a/gettext-tools/man/autopoint.1.html b/gettext-tools/man/autopoint.1.html
index 76db50f58..eecec51d9 100644
--- a/gettext-tools/man/autopoint.1.html
+++ b/gettext-tools/man/autopoint.1.html
@@ -115,11 +115,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 2002-2006 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.
+Copyright 2002-2007 Free Software Foundation, Inc. License
+GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/gettextize.1 b/gettext-tools/man/gettextize.1
index 1b832514d..2b8e40589 100644
--- a/gettext-tools/man/gettextize.1
+++ b/gettext-tools/man/gettextize.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH GETTEXTIZE "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH GETTEXTIZE "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 gettextize \- install or upgrade gettext infrastructure
 .SH SYNOPSIS
@@ -23,6 +23,9 @@ force writing of new files even if old exist
 \fB\-\-intl\fR
 install libintl in a subdirectory
 .TP
+\fB\-\-po\-dir\fR=\fIDIR\fR
+specify directory with PO files
+.TP
 \fB\-\-no\-changelog\fR
 don't update or create ChangeLog files
 .TP
@@ -36,10 +39,11 @@ Written by Ulrich Drepper
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B gettextize
diff --git a/gettext-tools/man/gettextize.1.html b/gettext-tools/man/gettextize.1.html
index f46738315..fca875f79 100644
--- a/gettext-tools/man/gettextize.1.html
+++ b/gettext-tools/man/gettextize.1.html
@@ -93,6 +93,18 @@ force writing of new files even if old exist
 
 install libintl in a subdirectory
 
+
+
+
      
+--po-dir=DIR
      
+
+
+
+
      
+specify directory with PO files
      
+
 
@@ -151,12 +163,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
      
 
      
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 1995-1998, 2000-2006 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.
+Copyright 1995-1998, 2000-2007 Free Software Foundation,
+Inc. License GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgattrib.1 b/gettext-tools/man/msgattrib.1
index f19204006..c2315324b 100644
--- a/gettext-tools/man/msgattrib.1
+++ b/gettext-tools/man/msgattrib.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGATTRIB "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGATTRIB "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgattrib \- attribute matching and manipulation on message catalog
 .SH SYNOPSIS
@@ -135,10 +135,11 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 2001-2006 Free Software Foundation, Inc.
+Copyright \(co 2001-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgattrib
diff --git a/gettext-tools/man/msgattrib.1.html b/gettext-tools/man/msgattrib.1.html
index 9729ff8d2..f1e69e706 100644
--- a/gettext-tools/man/msgattrib.1.html
+++ b/gettext-tools/man/msgattrib.1.html
@@ -553,11 +553,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 2001-2006 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.
+Copyright 2001-2007 Free Software Foundation, Inc. License
+GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgcat.1 b/gettext-tools/man/msgcat.1
index 07d1682b9..1b0aa3904 100644
--- a/gettext-tools/man/msgcat.1
+++ b/gettext-tools/man/msgcat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCAT "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGCAT "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgcat \- combines several message catalogs
 .SH SYNOPSIS
@@ -68,6 +68,16 @@ encoding for output
 use first available translation for each
 message, don't merge several translations
 .TP
+\fB\-\-color\fR
+use colors and other text attributes always
+.TP
+\fB\-\-color\fR=\fIWHEN\fR
+use colors and other text attributes if WHEN.
+WHEN may be 'always', 'never', 'auto', or 'html'.
+.TP
+\fB\-\-style\fR=\fISTYLEFILE\fR
+specify CSS style rule file for \fB\-\-color\fR
+.TP
 \fB\-e\fR, \fB\-\-no\-escape\fR
 do not use C escapes in output (default)
 .TP
@@ -119,10 +129,11 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 2001-2006 Free Software Foundation, Inc.
+Copyright \(co 2001-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgcat
diff --git a/gettext-tools/man/msgcat.1.html b/gettext-tools/man/msgcat.1.html
index d90a892b1..52a7418fa 100644
--- a/gettext-tools/man/msgcat.1.html
+++ b/gettext-tools/man/msgcat.1.html
@@ -240,6 +240,43 @@ encoding for output
 use first available translation for each message, don't
 merge several translations
 
+
+
+
      
+--color
      
+
+
+
+
      
+use colors and other text attributes always
      
+
+
+
+
      
+--color=WHEN
      
+
+
+
+
      
+use colors and other text attributes if WHEN. WHEN may be
+'always', 'never', 'auto', or 'html'.
      
+
+
+
+
      
+--style=STYLEFILE
      
+
+
+
+
      
+specify CSS style rule file for --color
      
+
 
@@ -449,11 +486,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
      
 
      
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 2001-2006 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.
+Copyright 2001-2007 Free Software Foundation, Inc. License
+GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgcmp.1 b/gettext-tools/man/msgcmp.1
index 3871afa08..f8f074e8b 100644
--- a/gettext-tools/man/msgcmp.1
+++ b/gettext-tools/man/msgcmp.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCMP "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGCMP "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgcmp \- compare message catalog and template
 .SH SYNOPSIS
@@ -56,10 +56,11 @@ Written by Peter Miller.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgcmp
diff --git a/gettext-tools/man/msgcmp.1.html b/gettext-tools/man/msgcmp.1.html
index 957074949..0712e9964 100644
--- a/gettext-tools/man/msgcmp.1.html
+++ b/gettext-tools/man/msgcmp.1.html
@@ -223,12 +223,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 1995-1998, 2000-2006 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.
+Copyright 1995-1998, 2000-2007 Free Software Foundation,
+Inc. License GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgcomm.1 b/gettext-tools/man/msgcomm.1
index fa805541d..98cebe727 100644
--- a/gettext-tools/man/msgcomm.1
+++ b/gettext-tools/man/msgcomm.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCOMM "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGCOMM "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgcomm \- match two message catalogs
 .SH SYNOPSIS
@@ -114,10 +114,11 @@ Written by Peter Miller.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgcomm
diff --git a/gettext-tools/man/msgcomm.1.html b/gettext-tools/man/msgcomm.1.html
index 3ca43284d..3179d419e 100644
--- a/gettext-tools/man/msgcomm.1.html
+++ b/gettext-tools/man/msgcomm.1.html
@@ -435,12 +435,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 1995-1998, 2000-2006 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.
+Copyright 1995-1998, 2000-2007 Free Software Foundation,
+Inc. License GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgconv.1 b/gettext-tools/man/msgconv.1
index 6c5027216..2bd5afcd1 100644
--- a/gettext-tools/man/msgconv.1
+++ b/gettext-tools/man/msgconv.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCONV "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGCONV "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgconv \- character set conversion for message catalog
 .SH SYNOPSIS
@@ -93,10 +93,11 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 2001-2006 Free Software Foundation, Inc.
+Copyright \(co 2001-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgconv
diff --git a/gettext-tools/man/msgconv.1.html b/gettext-tools/man/msgconv.1.html
index b4e6206fd..4d34273bd 100644
--- a/gettext-tools/man/msgconv.1.html
+++ b/gettext-tools/man/msgconv.1.html
@@ -383,11 +383,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 2001-2006 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.
+Copyright 2001-2007 Free Software Foundation, Inc. License
+GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgen.1 b/gettext-tools/man/msgen.1
index 620b8f293..6bb7318ed 100644
--- a/gettext-tools/man/msgen.1
+++ b/gettext-tools/man/msgen.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEN "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGEN "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgen \- create English message catalog
 .SH SYNOPSIS
@@ -90,10 +90,11 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 2001-2006 Free Software Foundation, Inc.
+Copyright \(co 2001-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgen
diff --git a/gettext-tools/man/msgen.1.html b/gettext-tools/man/msgen.1.html
index 1cdd38dc1..962404c35 100644
--- a/gettext-tools/man/msgen.1.html
+++ b/gettext-tools/man/msgen.1.html
@@ -359,11 +359,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 2001-2006 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.
+Copyright 2001-2007 Free Software Foundation, Inc. License
+GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgexec.1 b/gettext-tools/man/msgexec.1
index bfe4b5764..f368b1ab0 100644
--- a/gettext-tools/man/msgexec.1
+++ b/gettext-tools/man/msgexec.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEXEC "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGEXEC "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgexec \- process translations of message catalog
 .SH SYNOPSIS
@@ -46,10 +46,11 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 2001-2006 Free Software Foundation, Inc.
+Copyright \(co 2001-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgexec
diff --git a/gettext-tools/man/msgexec.1.html b/gettext-tools/man/msgexec.1.html
index dac9145a8..ab5881c4b 100644
--- a/gettext-tools/man/msgexec.1.html
+++ b/gettext-tools/man/msgexec.1.html
@@ -183,11 +183,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 2001-2006 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.
+Copyright 2001-2007 Free Software Foundation, Inc. License
+GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgfilter.1 b/gettext-tools/man/msgfilter.1
index d56475350..f533cdd39 100644
--- a/gettext-tools/man/msgfilter.1
+++ b/gettext-tools/man/msgfilter.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFILTER "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGFILTER "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgfilter \- edit translations of message catalog
 .SH SYNOPSIS
@@ -104,10 +104,11 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 2001-2006 Free Software Foundation, Inc.
+Copyright \(co 2001-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgfilter
diff --git a/gettext-tools/man/msgfilter.1.html b/gettext-tools/man/msgfilter.1.html
index 90fac1f86..5305c346c 100644
--- a/gettext-tools/man/msgfilter.1.html
+++ b/gettext-tools/man/msgfilter.1.html
@@ -422,11 +422,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 2001-2006 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.
+Copyright 2001-2007 Free Software Foundation, Inc. License
+GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgfmt.1 b/gettext-tools/man/msgfmt.1
index 5b462ea74..a25d29a2b 100644
--- a/gettext-tools/man/msgfmt.1
+++ b/gettext-tools/man/msgfmt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFMT "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGFMT "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgfmt \- compile message catalog to binary format
 .SH SYNOPSIS
@@ -144,10 +144,11 @@ Written by Ulrich Drepper.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgfmt
diff --git a/gettext-tools/man/msgfmt.1.html b/gettext-tools/man/msgfmt.1.html
index f97040a48..62fa4148c 100644
--- a/gettext-tools/man/msgfmt.1.html
+++ b/gettext-tools/man/msgfmt.1.html
@@ -576,12 +576,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 1995-1998, 2000-2006 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.
+Copyright 1995-1998, 2000-2007 Free Software Foundation,
+Inc. License GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msggrep.1 b/gettext-tools/man/msggrep.1
index 9136392a5..c78ce15ab 100644
--- a/gettext-tools/man/msggrep.1
+++ b/gettext-tools/man/msggrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGGREP "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGGREP "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msggrep \- pattern matching on message catalog
 .SH SYNOPSIS
@@ -152,10 +152,11 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 2001-2006 Free Software Foundation, Inc.
+Copyright \(co 2001-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msggrep
diff --git a/gettext-tools/man/msggrep.1.html b/gettext-tools/man/msggrep.1.html
index 6e5ac133e..004d86b8a 100644
--- a/gettext-tools/man/msggrep.1.html
+++ b/gettext-tools/man/msggrep.1.html
@@ -576,11 +576,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 2001-2006 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.
+Copyright 2001-2007 Free Software Foundation, Inc. License
+GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msginit.1 b/gettext-tools/man/msginit.1
index 3784fb36a..a298c9fb2 100644
--- a/gettext-tools/man/msginit.1
+++ b/gettext-tools/man/msginit.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGINIT "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGINIT "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msginit \- initialize a message catalog
 .SH SYNOPSIS
@@ -65,10 +65,11 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 2001-2006 Free Software Foundation, Inc.
+Copyright \(co 2001-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msginit
diff --git a/gettext-tools/man/msginit.1.html b/gettext-tools/man/msginit.1.html
index b1fbc556f..f83570fd7 100644
--- a/gettext-tools/man/msginit.1.html
+++ b/gettext-tools/man/msginit.1.html
@@ -264,11 +264,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 2001-2006 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.
+Copyright 2001-2007 Free Software Foundation, Inc. License
+GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgmerge.1 b/gettext-tools/man/msgmerge.1
index d5a1f421b..5285c6ad5 100644
--- a/gettext-tools/man/msgmerge.1
+++ b/gettext-tools/man/msgmerge.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGMERGE "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGMERGE "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgmerge \- merge message catalog and template
 .SH SYNOPSIS
@@ -149,10 +149,11 @@ Written by Peter Miller.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgmerge
diff --git a/gettext-tools/man/msgmerge.1.html b/gettext-tools/man/msgmerge.1.html
index fdcd4bc8d..7c7b5b02a 100644
--- a/gettext-tools/man/msgmerge.1.html
+++ b/gettext-tools/man/msgmerge.1.html
@@ -567,12 +567,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 1995-1998, 2000-2006 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.
+Copyright 1995-1998, 2000-2007 Free Software Foundation,
+Inc. License GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msgunfmt.1 b/gettext-tools/man/msgunfmt.1
index d32d23969..61590b3ca 100644
--- a/gettext-tools/man/msgunfmt.1
+++ b/gettext-tools/man/msgunfmt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNFMT "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGUNFMT "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msgunfmt \- uncompile message catalog from binary format
 .SH SYNOPSIS
@@ -117,10 +117,11 @@ Written by Ulrich Drepper.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msgunfmt
diff --git a/gettext-tools/man/msgunfmt.1.html b/gettext-tools/man/msgunfmt.1.html
index ef16540c1..4d5ff22ef 100644
--- a/gettext-tools/man/msgunfmt.1.html
+++ b/gettext-tools/man/msgunfmt.1.html
@@ -474,12 +474,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 1995-1998, 2000-2006 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.
+Copyright 1995-1998, 2000-2007 Free Software Foundation,
+Inc. License GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/msguniq.1 b/gettext-tools/man/msguniq.1
index a87b4e28f..6601233bd 100644
--- a/gettext-tools/man/msguniq.1
+++ b/gettext-tools/man/msguniq.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNIQ "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH MSGUNIQ "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 msguniq \- unify duplicate translations in message catalog
 .SH SYNOPSIS
@@ -108,10 +108,11 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 2001-2006 Free Software Foundation, Inc.
+Copyright \(co 2001-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B msguniq
diff --git a/gettext-tools/man/msguniq.1.html b/gettext-tools/man/msguniq.1.html
index e3cb06c7c..8d9a6d14d 100644
--- a/gettext-tools/man/msguniq.1.html
+++ b/gettext-tools/man/msguniq.1.html
@@ -422,11 +422,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 2001-2006 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.
+Copyright 2001-2007 Free Software Foundation, Inc. License
+GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/man/xgettext.1 b/gettext-tools/man/xgettext.1
index 80b5cb359..f8676c4bd 100644
--- a/gettext-tools/man/xgettext.1
+++ b/gettext-tools/man/xgettext.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH XGETTEXT "1" "October 2006" "GNU gettext-tools 0.16" GNU
+.TH XGETTEXT "1" "November 2007" "GNU gettext-tools 0.17" GNU
 .SH NAME
 xgettext \- extract gettext strings from source
 .SH SYNOPSIS
@@ -99,6 +99,10 @@ understand ANSI C trigraphs for input
 recognize Qt format strings
 (only language C++)
 .TP
+\fB\-\-kde\fR
+recognize KDE 4 format strings
+(only language C++)
+.TP
 \fB\-\-boost\fR
 recognize Boost format strings
 (only language C++)
@@ -156,6 +160,12 @@ set copyright holder in output
 \fB\-\-foreign\-user\fR
 omit FSF copyright in output for foreign user
 .TP
+\fB\-\-package\-name\fR=\fIPACKAGE\fR
+set package name in output
+.TP
+\fB\-\-package\-version\fR=\fIVERSION\fR
+set package version in output
+.TP
 \fB\-\-msgid\-bugs\-address\fR=\fIEMAIL\fR@ADDRESS
 set report address for msgid bugs
 .TP
@@ -176,10 +186,11 @@ Written by Ulrich Drepper.
 .SH "REPORTING BUGS"
 Report bugs to .
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later 
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B xgettext
diff --git a/gettext-tools/man/xgettext.1.html b/gettext-tools/man/xgettext.1.html
index be1bb7d9e..e52178878 100644
--- a/gettext-tools/man/xgettext.1.html
+++ b/gettext-tools/man/xgettext.1.html
@@ -343,6 +343,19 @@ C++, ObjectiveC)
 
 recognize Qt format strings (only language C++)
 
+
+
+
      
+--kde
      
+
+
+
+
      
+recognize KDE 4 format strings (only language
+C++)
      
+
 
@@ -568,6 +581,30 @@ set copyright holder in output
      
 
      
 
 omit FSF copyright in output for foreign user
 
+
+
+
      
+--package-name=PACKAGE
      
+
+
+
+
      
+set package name in output
      
+
+
+
+
      
+--package-version=VERSION
      
+
+
+
+
      
+set package version in output
      
+
 
@@ -661,12 +698,12 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
      
 
      
        cols="2" cellspacing="0" cellpadding="0">
 
 
-Copyright 1995-1998, 2000-2006 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.
+Copyright 1995-1998, 2000-2007 Free Software Foundation,
+Inc. License GPLv3+: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>
      
+This is free software: you are free to change and
+redistribute it. There is NO WARRANTY, to the extent
+permitted by law.
 
 
      SEE ALSO
      
 
diff --git a/gettext-tools/po/be.po b/gettext-tools/po/be.po
index 6796e0348..e0c4246e5 100644
--- a/gettext-tools/po/be.po
+++ b/gettext-tools/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2002-09-04 18:51+0300\n"
 "Last-Translator: Ales Nyakhaychyk \n"
 "Language-Team: Belarusian \n"
@@ -16,91 +16,92 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, fuzzy, c-format
 msgid "invalid argument %s for %s"
 msgstr "нерэчаісны аргумэнт `%s' для `%s'"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, fuzzy, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Рэчаісныя аргумэнты:"
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "немагчыма стварыць часовую дырэкторыю,\n"
 "выкарыстоўвываючы ўзор \"%s\""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "немагчыма стварыць файл вываду \"%s\""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
 "немагчыма стварыць часовую дырэкторыю,\n"
 "выкарыстоўвываючы ўзор \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "памылка ў час чытаньня файла \"%s\""
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "памылка чытаньня \"%s\""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "памылка запісу файла \"%s\""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "памылка пасля чытаньня \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() памылка"
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, fuzzy, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -110,120 +111,120 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Невядомая сістэмная памылка"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s падпрацэс спынены з-за памылкі"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: выбар `%s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: нераспазнаны выбар `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: нераспазнаны выбар `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: несапраўдны выбар -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: нерэчаісны выбар -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: выбар патрабуе аргумэнт -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: выбар `-W %s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "немагчыма стварыць \"%s\""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "памылка ў час запісу файла \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "падпрацэс %s, памылка ўводу-вываду"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "памяць вычарпана"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "не магчыма стварыць канвеэр"
@@ -247,281 +248,288 @@ msgstr "не магчыма стварыць канвеэр"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, fuzzy, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s падпрацэс"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s падрацэс атрымаў фатальны сігнал %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "спэцыфікацыя фармату для аргумэнта %u ня йснуе ў '%s'"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "спэцыфікацыя фармату для аргумэнта {%u}, як у '%s', не йснуе ў 'msgid'"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "спэцыфікацыя фармату для аргумэнта {%u} не йснуе ў '%s'"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr ""
 "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта {%u} не аднолькавыя"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -532,90 +540,90 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr ""
 "спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "спцэыфікацыя фармату для аргумэнта \"%s\" ня йснуе ў \"%s\""
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 "tuple"
 msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -623,7 +631,7 @@ msgid ""
 msgstr ""
 "спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -631,119 +639,118 @@ msgid ""
 msgstr ""
 "спэцыфікацыі фармату для аргумэнту '%s', як у '%s', не існуюць у'msgid'"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n"
-"пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
-"магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Аўтар %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "вельмі шмат аргумэнтаў"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Друкуе назву вузла.\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, fuzzy, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -756,34 +763,34 @@ msgstr ""
 "                        назву маёнтка й прозьвішчы\n"
 "  -i, --ip-address      адрас для вузла\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, fuzzy, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -791,42 +798,47 @@ msgstr ""
 "  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
 "  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "Паведамляйце аб памылках на адрас .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "немагчыма атрымаць назву вузла"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "па большай частцы адзін уваходзячы файл зацьверджан"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s і %s узаема выключны"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -835,40 +847,40 @@ msgstr ""
 "Фільтруе паведамленьні каталёга перакладаў суадносна іх атрыбутам, а так сама,\n"
 "узьдзейнічае на іх\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, fuzzy, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
@@ -876,24 +888,24 @@ msgstr ""
 "  ФАЙЛ ...                 .mo файлы\n"
 "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, fuzzy, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -904,203 +916,203 @@ msgstr ""
 "Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
 "зададзена, ці замест яго -.\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1121,31 +1133,31 @@ msgstr ""
 "                           даўжэй чым шырыня, на некалькі радкоў\n"
 "  -s, --sort-output        ствараць упарадкаваны вывад\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "зададзен немагчымы крытэрый выбару (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1169,51 +1181,51 @@ msgstr ""
 "будуць узяты  з першага PO-файла.\n"
 "Пазіцыі з усіх PO-файлаў будуць аб'яднаны ў кучу\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1221,39 +1233,53 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "не зададзены ўводзячыя файлы"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "патрабуецца менавіта 2 уводзячых файла"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] def.po ref.pot\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1271,22 +1297,22 @@ msgstr ""
 "супадзеньне ня будзе знойдзена, выкарыстоўвываецца недакладае - для\n"
 "лепшай праверкі.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, fuzzy, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1296,7 +1322,7 @@ msgstr ""
 "  -m, --multi-domain          прымяніць ref.pot для кожнага маёнтка з def."
 "po\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
@@ -1304,42 +1330,42 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...але гэта вызначэньне падобна"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана ў %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1347,12 +1373,12 @@ msgstr[0] "знойдзена %d фатальная памылка"
 msgstr[1] "знойдзена %d фатальныя памылкі"
 msgstr[2] "знойдзена %d фатальных памылак"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "неабходна задаць не менш двух файлаў"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1373,30 +1399,30 @@ msgstr ""
 "камэнтары будуць захаваны, але толькі зь першага PO файла, у якім яны былі\n"
 "вызначаны.  Каментары становішчаў у файлах з усіх PO файлаў будуць аб'яднаны.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Пераўтварае каталёг з перакладамі ў розныя сімвальныя кадзіроўкі.\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, fuzzy, c-format
 msgid "Conversion target:\n"
 msgstr "памылка пераўтварэньня"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, fuzzy, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
@@ -1404,46 +1430,46 @@ msgstr ""
 "  -t, --to-code=НАЗВА         перакаўтварае кадзіроўку для вываду\n"
 "Звычайна выкарыстоўвываецца бягучая кадзіроўка лакалі\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr "патрабуецца менавіта адзін уваходзячы файл"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] УВАХОДЗЯЧЫ_ФАЙЛ\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1456,22 +1482,22 @@ msgstr ""
 "Неперакладзеныя уваходжаньні прымаюцца як пераклады, аднолькавыя msgid, і\n"
 "пазначаюцца як недакладныя (fuzzy).\n"
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr "прапушчана назва каманды"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] ЗАГАД [ВЫБАР_ЗАГАДА]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1485,7 +1511,7 @@ msgstr ""
 "адзін раз для кожнага пераклада.  Яго вывад становіцца вывадам msgexec.\n"
 "Праграма msgexec вяртае код - гэта найбольшы код вяртаньня паміж усіх выклікаў.\n"
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1494,42 +1520,42 @@ msgstr ""
 "Асабісты ўбудаваны загад, завецца '0', выводзіць пераклад й нулявы байт за ім.\n"
 "Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs -0\".\n"
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr "памылка запісу ў stdout"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "памылка запісу ў падпрацэс %s"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr "прапушчана назва фільтра"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "па меншай меры адзін sed-скрыпт павінен быць зададзены"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1539,18 +1565,18 @@ msgstr ""
 "ўводу\n"
 "й запісвае зьмененыя пераклады ў стандартны вывад.\n"
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1558,91 +1584,91 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "памылка чытаньня з падпрацэса %s"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s патрабуе \"-d дырэкторыя\" спэцыфікацыі"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s рэчаісны толькі з %s ці %s"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s рэчаісны толькі з %s ці %s"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1650,7 +1676,7 @@ msgstr[0] "%d паведамленьне перакладзена"
 msgstr[1] "%d паведамленьні перакладзена"
 msgstr[2] "%d паведамленьняў перакладзена"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1664,7 +1690,7 @@ msgstr[2] ""
 ",\n"
 "%d недакладных перакладаў"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1678,17 +1704,17 @@ msgstr[2] ""
 ",\n"
 "%d неперакладзеных паведамленьняў"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n"
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1697,31 +1723,31 @@ msgstr ""
 "Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n"
 "і для кароткі.  Тое саме-ж і для выбарачных аргумэнтаў.\n"
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
@@ -1729,7 +1755,7 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1739,13 +1765,13 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, fuzzy, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
@@ -1753,41 +1779,41 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1805,48 +1831,48 @@ msgstr ""
 "абмежаваным падкрэсьліваньнем.  Выбар -d абавязковы.  Кляс запісваецца ў\n"
 "зададзеную дырэкторыю.\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1854,33 +1880,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1888,12 +1914,12 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, fuzzy, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -1903,7 +1929,7 @@ msgstr ""
 "d)\n"
 "      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, fuzzy, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -1913,80 +1939,80 @@ msgstr ""
 "d)\n"
 "      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "увага: пераўтварэньне кадзіровак не будзе працаваць\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n"
 "будзе выкарыстаны прэфікс"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "дырэктыва `domain %s' ігнаруецца"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "парожняе уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "памылка ў час чытаньня \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -1994,14 +2020,14 @@ msgid ""
 msgstr ""
 "выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2041,30 +2067,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2075,12 +2101,12 @@ msgstr ""
 "Калі ласка, задайце мясцовасьць з дапамогай выбару --locale\n"
 "ці .po файл вываду з дапамогай выбару --output-file.\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "Створан %s.\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2089,12 +2115,12 @@ msgstr ""
 "Стварае новы PO файл, задае пачатковыя мэтададзеныя значэньнямі з асяродзьдзя\n"
 "карыстальніка.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, fuzzy, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2105,12 +2131,12 @@ msgstr ""
 "  ФАЙЛ ...                 .mo файлы\n"
 "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, fuzzy, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2121,18 +2147,18 @@ msgstr ""
 "      --strict                уключае рэжым жорсткага адпавяданьня Uniforum\n"
 "Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2140,12 +2166,12 @@ msgstr ""
 "Знойдзен больш чым адзін .pot файл.\n"
 "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "памылка чытаньня бягучай дырэкторыі"
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2153,14 +2179,14 @@ msgstr ""
 "Ня знойдзен .pot файл у бягучай дырэкторыі.\n"
 "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, fuzzy, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2172,22 +2198,22 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "Беларускі пераклад для %s"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "уваходзячы файл зьмяшчае два розных набора сімвалаў \"%s\" і \"%s\""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -2195,7 +2221,7 @@ msgstr ""
 "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
 "са сьпецыфікацыей кодавай старонкі"
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, fuzzy, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2204,26 +2230,26 @@ msgstr ""
 "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
 "са сьпецыфікацыей кодавай старонкі"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "увага: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2232,7 +2258,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2241,7 +2267,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2250,12 +2276,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2263,7 +2289,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2272,7 +2298,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2280,25 +2306,25 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "выраз множнага ліку можа ўтвараць адмоўнае значэньне"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як %lu"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "выраз множнага ліку можа ўтвараць дзяленьне на нуль"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "выраз множнага ліку можа ўтвараць цэлалікавае перапаўненьне"
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2306,40 +2332,40 @@ msgstr ""
 "выраз множнага ліку можа ўтвараць арыфмэтычныя выключэньні, магчыма\n"
 "дзяленьне на нуль"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "нерэчаіснае значэньне nplurals"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "нерэчаісны выраз формы мнножнага ліку (plural)"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2349,7 +2375,7 @@ msgstr[1] "...але некаторыя паведамленьні маюць т
 msgstr[2] ""
 "...але некаторыя паведамленьні маюць толькі %lu формаў множнага ліку"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2357,88 +2383,88 @@ msgstr[0] "...але некаторыя паведамленьні маюць а
 msgstr[1] "...але некаторыя паведамленьні маюць %lu формы множнага ліку"
 msgstr[2] "...але некаторыя паведамленьні маюць %lu формаў множнага ліку"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 #, fuzzy
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "памылка ў час чытаньня файла \"%s\""
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2447,15 +2473,15 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
 "але iconv() не падтрымлівае \"%s\".\n"
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2577,17 +2603,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "гэтае паведамленьне павінна вызначаць хормы множнага ліка"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "гэтае паведамленьне не павінна вызначаць хормы множнага ліка"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2596,26 +2622,26 @@ msgstr ""
 "%sПрачытана %ld старых + %ld новых, аб'яднаных %ld, недакладных %ld;\n"
 "прапушчана %ld, састарэлых %ld.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " зроблена.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s і яўная назва файла ўзаема выключальны"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Пераўтварае дваічны каталёг паведамленьняў у Uniforum .po файл.\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, fuzzy, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2625,7 +2651,7 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
@@ -2633,7 +2659,7 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2643,7 +2669,7 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, fuzzy, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2652,17 +2678,17 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2679,41 +2705,41 @@ msgstr ""
 "абмежаваным падкрэсьліваньнем.  Выбар -d абавязковы.  Кляс запісваецца ў\n"
 "зададзеную дырэкторыю.\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2726,12 +2752,12 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, fuzzy, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2741,12 +2767,12 @@ msgstr ""
 "  -d, --repeated                 друкаваць толькі паўтараючыеся\n"
 "  -u, --unique                   друкаваць толькі непаўторныя\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2755,7 +2781,7 @@ msgstr ""
 "Кадзіроўка \"%s\" не з'яўляецца перанасімай назвай кадзіроўкі.\n"
 "Пераўтварэньне паведамленьняў у кадзіроўку карыстальніка можа не працаваць\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2764,7 +2790,7 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
 "але iconv() не падтрымлівае \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2772,15 +2798,15 @@ msgstr ""
 "Усталяваньне GNU libiconv і пераўсталяваньне GNU gettext\n"
 "павінна выправіць гэту праблему.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Працяг выкананьня... чакаюцца памылкі разбору."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Працяг выкананьня..."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2789,7 +2815,7 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
 "Гэта вэрсія пабудавана без iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2798,150 +2824,150 @@ msgstr ""
 "Пераўтварэньне паведамленьняў у набор сімвалаў карыстальніка працаваць не "
 "будзе.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "несумяшчальнае ўжываньне #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "прапушчана секцыя \"msgstr[]\""
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "прапушчана секцыя \"msgid_plural\""
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "прапушчана секцыя \"msgstr\""
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "першая форма ліку мае ненулявы індэкс"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "формы множнага ліку маюць дрэнныі індэкс"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "вельмі шмат памылак..."
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "нерэчаісная шматсімвальная паслядоўнасць"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы файла"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы радка"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr "памылка iconv"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "невядомае ключавое слова \"%s\""
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "нерэчаісная кантралюючая паслядоўнасць"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "сімвал канца файла знаходзіцца ўнутры радка"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "сімвал канца радка знаходзіцца ўнутры радка"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "двайное вызначэньне паведамленьня"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...гэта месцазнаходжаньне першага вызначэньня"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "файл \"%s\" абрэзан"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файл \"%s\" змяшчае радок не завершаны нулём"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "фармат файла \"%s\" не GNU .mo"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файл \"%s\" зьмяшчае радок не завершаны нулём, ля %s"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s: увага: "
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Аўтар %s.\n"
@@ -2950,148 +2976,147 @@ msgstr "Аўтар %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "памылка ў час чытаньня файла \"%s\""
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr "чакалісь два аргумэнты"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] URL ФАЙЛ\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr "памылка запісу ў stdout"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 #, fuzzy
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "немагчыма стварыць файл вываду \"%s\""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "стандартны вывад"
 
-#: src/write-csharp.c:618
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "немагчыма стварыць \"%s\""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, fuzzy, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
 "ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-java.c:920
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr ""
+"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
+"ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "нерэчаісная назва Java-класа: %s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
 "ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
+"ці ўсталяваць пераменную асяроддзя $JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "памылка ў час адкрыцця \"%s\" для запісу"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3105,7 +3130,7 @@ msgstr ""
 "выкарыстаньня толькі ASCII сымбаляў у msgid\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3119,13 +3144,13 @@ msgstr ""
 "выкарыстаньня толькі ASCII сымбаляў у msgid\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3133,138 +3158,138 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "памылка ў час запісу файла \"%s\""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "памылка iconv"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3273,42 +3298,47 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
 "Гэта вэрсія пабудавана без iconv().\n"
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: увага: незавершаны радок"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: нерэчаіснае вызначэньне радка"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3316,7 +3346,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3324,7 +3354,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3332,7 +3362,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3340,7 +3370,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3348,7 +3378,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3356,77 +3386,77 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: нерэчаіснае вызначэньне радка"
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: прапушчан нумар пасьля #"
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: нерэчаісны выраз-радок"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--joun-existing не можа быць выкарастаны пры запісы ў stdout"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3438,58 +3468,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3498,14 +3528,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3513,7 +3543,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3522,17 +3552,17 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, fuzzy, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
@@ -3540,12 +3570,20 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
+
+#: src/xgettext.c:863
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
@@ -3553,79 +3591,89 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "стандартны ўвод"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: увага: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, fuzzy, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3634,7 +3682,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3644,27 +3692,27 @@ msgstr ""
 "gettext(\"\") вяртае загаловак зь\n"
 "метададзенымі, а ня пусты радок.\n"
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3672,15 +3720,39 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "невядомая мова `%s'"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n"
+#~ "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
+#~ "магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+
 #~ msgid "%s: warning: "
 #~ msgstr "%s: увага: "
 
diff --git a/gettext-tools/po/ca.po b/gettext-tools/po/ca.po
index b4b1bc5f7..bbd47d5ca 100644
--- a/gettext-tools/po/ca.po
+++ b/gettext-tools/po/ca.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-27 15:20+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-10-28 18:06+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer \n"
 "Language-Team: Catalan \n"
diff --git a/gettext-tools/po/cs.po b/gettext-tools/po/cs.po
index 6fd4c3576..4485e2b8c 100644
--- a/gettext-tools/po/cs.po
+++ b/gettext-tools/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.38\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2001-08-18 15:22+0200\n"
 "Last-Translator: Vladimir Michl \n"
 "Language-Team: Czech \n"
@@ -23,97 +23,98 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
 # src/message.c:1115
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 # src/message.c:1115
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 # src/message.c:1115
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 # src/message.c:1115
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
 # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
 # src/xget-lex.c:191 src/xgettext.c:616
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
 
 # src/msgfmt.c:321
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "chyba pøi otevírání souboru \"%s\" pro zápis"
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "chyba pøi ètení \"%s\""
 
 # src/message.c:1182
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "chyba pøi zápisu do souboru \"%s\""
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "chyba pøi ètení \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -123,133 +124,133 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Neznámá systémová chyba"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
 # lib/getopt.c:628
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: pøepínaè `%s' není jednoznaèný\n"
 
 # lib/getopt.c:652
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè `--%s' musí být zadán bez argumentu\n"
 
 # lib/getopt.c:657
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè `%c%s' musí být zadán bez argumentu\n"
 
 # lib/getopt.c:674 lib/getopt.c:847
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: pøepínaè `%s' vy¾aduje argument\n"
 
 # lib/getopt.c:703
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: neznámý pøepínaè `--%s'\n"
 
 # lib/getopt.c:707
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: neznámý pøepínaè `%c%s'\n"
 
 # lib/getopt.c:733
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: neznámý pøepínaè -- %c\n"
 
 # lib/getopt.c:736
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: neznámý pøepínaè -- %c\n"
 
 # lib/getopt.c:766 lib/getopt.c:896
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: pøepínaè vy¾aduje argument -- %c\n"
 
 # lib/getopt.c:813
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n"
 
 # lib/getopt.c:831
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè ` -W %s' musí být zadán bez argumentu\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 # src/message.c:1182
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba pøi zápisu do souboru \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 # lib/xmalloc.c:82
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "pamì» vyèerpána"
 
 # src/message.c:1115
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
@@ -273,251 +274,258 @@ msgstr "v
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
 # src/msgfmt.c:909
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 # src/msgfmt.c:892
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -525,7 +533,7 @@ msgid ""
 msgstr ""
 
 # src/msgfmt.c:909
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -533,27 +541,27 @@ msgid ""
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -564,61 +572,61 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
 # src/msgfmt.c:892
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
 
 # src/msgfmt.c:909
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -626,24 +634,24 @@ msgid ""
 msgstr ""
 
 # src/msgfmt.c:909
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
 # src/msgfmt.c:892
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -651,7 +659,7 @@ msgid ""
 msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
 
 # src/msgfmt.c:892
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -659,7 +667,7 @@ msgid ""
 msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
 
 # src/msgfmt.c:909
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -667,126 +675,123 @@ msgid ""
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-# src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
-# src/msgunfmt.c:175 src/xgettext.c:394
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"  Copyright (C) %s Free Software Foundation, Inc.\n"
-"  Toto je volné programové vybavení; podmínky pro kopírování a roz¹iøování\n"
-"naleznete ve zdrojových textech. Toto programové vybavení je zcela BEZ ZÁRUKY,\n"
-"a to i bez záruky PRODEJNOSTI nebo VHODNOSTI PRO NÌJAKÝ KONKRÉTNÍ ÚÈEL.\n"
 
 # src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
 # src/msgunfmt.c:180 src/xgettext.c:399
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autor: %s\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
 # src/gettextp.c:164
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "pøíli¹ mnoho argumentù"
 
 # src/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298
 # src/msgunfmt.c:210 src/xgettext.c:532
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Více informací získáte pøíkazem `%s --help'.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -794,45 +799,49 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
 # src/gettextp.c:255 src/msgcmp.c:200 src/msgfmt.c:386 src/msgmerge.c:331
 # src/msgunfmt.c:234 src/xgettext.c:582
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 #, fuzzy
 msgid "Report bugs to .\n"
 msgstr ""
@@ -840,302 +849,303 @@ msgstr ""
 "(pouze\n"
 "anglicky), pøipomínky k pøekladu zasílejte na adresu  (èesky).\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "jsou po¾adovány pøesnì 2 vstupní soubory"
 
 # src/xgettext.c:378 src/xgettext.c:382
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s se vzájemnì vyluèují"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "vstupní soubor není zadán"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
 # src/msgunfmt.c:215
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1158,31 +1168,31 @@ msgstr ""
 "  -V, --version            vypí¹e oznaèení verze a ukonèí se\n"
 "  -w, --width=ÈÍSLO        nastaví ¹íøku výstupní stránky\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "zadáno nemo¾né výbìrové kritérium (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1211,51 +1221,51 @@ msgstr ""
 "ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n"
 "v souborech bude ponecháno ze v¹ech .po souborù.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1263,42 +1273,56 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
 # src/msgcmp.c:160 src/msgmerge.c:267
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "vstupní soubory nejsou zadány"
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "jsou po¾adovány pøesnì 2 vstupní soubory"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
 # src/msgcmp.c:186
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1323,75 +1347,75 @@ msgstr ""
 "va¹em programu. Pokud pøi porovnávání nejsou zprávy pøesnì shodné, zkoumá se,\n"
 "zda si nejsou podobné.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
 # src/msgcmp.c:281
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "upozornìní: tato zpráva není pou¾ita"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
 # src/msgcmp.c:259 src/msgmerge.c:711
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "tato zpráva je pou¾ita, ale nikoli definována..."
 
 # src/msgcmp.c:261 src/msgmerge.c:713
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ale tato definice je podobná"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
 # src/msgcmp.c:281
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "upozornìní: tato zpráva není pou¾ita"
 
 # src/po-lex.c:84
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1399,12 +1423,12 @@ msgstr[0] "nalezena %d z
 msgstr[1] "nalezeny %d záva¾né chyby"
 msgstr[2] "nalezeno %d záva¾ných chyb"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "musí být zadány nejménì dva rùzné soubory"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1432,76 +1456,76 @@ msgstr ""
 "ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n"
 "v souborech bude ponecháno ze v¹ech .po souborù.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "vstupní soubor není zadán"
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "jsou po¾adovány pøesnì 2 vstupní soubory"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1510,23 +1534,23 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
 # src/gettextp.c:154
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "chybí argumenty"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1536,68 +1560,68 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
 # src/gettextp.c:154
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "chybí argumenty"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "musí být zadány nejménì dva rùzné soubory"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1605,92 +1629,92 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
 # src/msgfmt.c:343
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1699,7 +1723,7 @@ msgstr[1] "%d p
 msgstr[2] "%d pøelo¾ených zpráv"
 
 # src/msgfmt.c:345
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1708,7 +1732,7 @@ msgstr[1] ", %d ne
 msgstr[2] ", %d neúplných pøekladù"
 
 # src/msgfmt.c:347
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1716,105 +1740,105 @@ msgstr[0] ", %d nep
 msgstr[1] ", %d nepøelo¾ené zprávy"
 msgstr[2] ", %d nepøelo¾ených zpráv"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1824,48 +1848,48 @@ msgid ""
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "vstupní soubor není zadán"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1873,33 +1897,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1907,67 +1931,67 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n"
 "%*s  upozornìní: pøevod znakové sady nebude fungovat"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "V hlavièce chybí definice znakové sady.\n"
 "Konverze zpráv do u¾ivatelovy znakové sady není mo¾ná.\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n"
 "%*s  upozornìní: pøevod znakové sady nebude fungovat"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 # src/msgfmt.c:471
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "jméno domény \"%s\" není vhodné jako jméno souboru"
 
 # src/msgfmt.c:476
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -1975,56 +1999,56 @@ msgstr ""
 "pøedpona"
 
 # src/msgfmt.c:489
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "pøíkaz `domain %s' ignorován"
 
 # src/msgfmt.c:517
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "prázdná polo¾ka `msgstr' ignorována"
 
 # src/msgfmt.c:518
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "neúplná polo¾ka `msgstr' ignorována"
 
 # src/msgfmt.c:668
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornìní: zdrojový soubor obsahuje neúplný pøeklad"
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pøi ètení \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2064,30 +2088,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2095,24 +2119,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2120,54 +2144,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2179,54 +2203,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: upozornìní: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2235,7 +2259,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2244,7 +2268,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2253,12 +2277,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2266,7 +2290,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2275,7 +2299,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2283,66 +2307,66 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 # src/po-lex.c:332
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "neplatná øídící sekvence"
 
 # src/po-lex.c:332
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "neplatná øídící sekvence"
 
 # src/po-lex.c:332
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "neplatná øídící sekvence"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2351,7 +2375,7 @@ msgstr[1] "tato zpr
 msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2359,100 +2383,100 @@ msgstr[0] "tato zpr
 msgstr[1] "tato zpráva je pou¾ita, ale nikoli definována v %s"
 msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgid_plural' nezaèínají '\\n'"
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nezaèínají '\\n'"
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr' nezaèínají '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgid_plural' nekonèí '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nekonèí '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr' nekonèí '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 # src/msgfmt.c:561
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "polo¾ka hlavièky `%s' v hlavièce chybí"
 
 # src/msgfmt.c:564
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "polo¾ka hlavièky `%s' by mìla zaèínat na zaèátku øádku"
 
 # src/msgfmt.c:573
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "nìkteré polo¾ky hlavièky mají stále poèáteèní implicitní hodnotu"
 
 # src/msgfmt.c:583
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "polo¾ka `%s' má stále poèáteèní implicitní hodnotu"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
 # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
 # src/xget-lex.c:191 src/xgettext.c:616
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2461,15 +2485,15 @@ msgstr ""
 "Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n"
 "a iconv() \"%s\" nepodporuje.\n"
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2594,19 +2618,19 @@ msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
 # src/msgmerge.c:769
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2616,62 +2640,62 @@ msgstr ""
 "chybí %ld, zastaralých %ld.\n"
 
 # src/msgmerge.c:775
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " dokonèeno.\n"
 
 # src/xgettext.c:378 src/xgettext.c:382
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s a %s se vzájemnì vyluèují"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2680,41 +2704,41 @@ msgid ""
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "vstupní soubor není zadán"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2727,24 +2751,24 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2753,7 +2777,7 @@ msgstr ""
 "Oznaèení znakové sady \"%s\" není portabilní název kódování. \n"
 "Pøevod znakù do u¾ivatelské znakové sady nebude fungovat.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2762,7 +2786,7 @@ msgstr ""
 "Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n"
 "a iconv() \"%s\" nepodporuje.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2770,15 +2794,15 @@ msgstr ""
 "Instalace GNU libiconv a následná reinstalace GNU gettextu\n"
 "mù¾e napravit tento problém.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Pokraèuji, pøedpokládána chyba parsingu."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Pokraèuji."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2787,7 +2811,7 @@ msgstr ""
 "Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n"
 "Tato verze byla kompilována bez iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2795,173 +2819,173 @@ msgstr ""
 "V hlavièce chybí definice znakové sady.\n"
 "Konverze zpráv do u¾ivatelovy znakové sady není mo¾ná.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "nekonzistentní pou¾ití #~"
 
 # ../../src/po-gram.y:83
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "chybí sekce `msgstr[]'"
 
 # ../../src/po-gram.y:83
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "chybí sekce `msgid_plural'"
 
 # ../../src/po-gram.y:83
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "chybí sekce `msgstr'"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "první mno¾né èíslo má nenulový index"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "mno¾né èíslo má chybný index"
 
 # src/po-lex.c:129 src/po-lex.c:168
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "pøíli¹ mnoho chyb, konèím"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neplatná víceznaková sekvence"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "neplatná víceznaková sekvence"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "neplatná víceznaková sekvence"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
 # src/po-lex.c:241
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "klíèové slovo \"%s\" není známo"
 
 # src/po-lex.c:332
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "neplatná øídící sekvence"
 
 # src/po-lex.c:420
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "konec souboru uprostøed øetìzce"
 
 # src/po-lex.c:415
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "konec øádku uprostøed øetìzce"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
 # src/xgettext.c:658 src/xgettext.c:968
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento soubor nemù¾e obsahovat pøíkazy pro doménu"
 
 # src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "dvojnásobná definice zprávy"
 
 # src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...toto je umístìní první definice"
 
 # src/msgunfmt.c:267 src/msgunfmt.c:331
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "soubor \"%s\" je useknutý"
 
 # src/msgunfmt.c:373
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL"
 
 # src/msgunfmt.c:373
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "soubor \"%s\" není v GNU .mo formátu"
 
 # src/msgunfmt.c:373
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL"
 
 # src/xget-lex.c:892
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%d: upozornìní: neukonèená znaková konstanta"
 
 # src/xget-lex.c:914
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
 # src/xget-lex.c:914
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s:%d: upozornìní: klíèové slovo uhnízdìno v argumentu klíèového slova"
 
 # src/xget-lex.c:914
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
 # src/xget-lex.c:914
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
 # src/xget-lex.c:914
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%d: upozornìní: klíèové slovo uhnízdìno v argumentu klíèového slova"
 
 # src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
 # src/msgunfmt.c:180 src/xgettext.c:399
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Autor: %s\n"
@@ -2970,46 +2994,46 @@ msgstr "Autor: %s\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
 # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
 # src/xget-lex.c:191 src/xgettext.c:616
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
 
 # src/gettextp.c:164
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "pøíli¹ mnoho argumentù"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3017,100 +3041,97 @@ msgid ""
 msgstr ""
 
 # src/message.c:1182
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "chyba pøi zápisu do souboru \"%s\""
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
 # src/message.c:1115
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 # src/message.c:1122
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "standardní výstup"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
 # src/msgfmt.c:321
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba pøi otevírání souboru \"%s\" pro zápis"
 
 # src/message.c:784
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "zprávy katalogu nesmí obsahovat escape sekvenci `\\%c'"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3119,7 +3140,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3128,13 +3149,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3142,7 +3163,7 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3150,100 +3171,100 @@ msgid ""
 msgstr ""
 
 # src/message.c:1182
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "chyba pøi zápisu do souboru \"%s\""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
 # src/xget-lex.c:914
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
 # src/xget-lex.c:914
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
 # src/xget-lex.c:892
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozornìní: neukonèená znaková konstanta"
 
 # src/xget-lex.c:914
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3251,33 +3272,33 @@ msgid ""
 msgstr ""
 
 # src/xget-lex.c:892
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: upozornìní: neukonèená znaková konstanta"
 
 # src/xget-lex.c:914
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3286,43 +3307,49 @@ msgstr ""
 "Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n"
 "Tato verze byla kompilována bez iconv().\n"
 
+# src/xget-lex.c:914
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
 # lib/getopt.c:736
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: neznámý pøepínaè -- %c\n"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3330,7 +3357,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3338,7 +3365,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3346,7 +3373,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3354,7 +3381,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3362,7 +3389,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3370,28 +3397,28 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
 # src/xget-lex.c:914
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3399,52 +3426,52 @@ msgid ""
 msgstr ""
 
 # src/xgettext.c:386
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing nemù¾e být pou¾it, je-li výstup zapisován do stdout"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nemù¾e pracovat bez toho, ani¾ by znal slova, která má hledat"
 
 # src/xgettext.c:501
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "upozornìní: pøípona `%2$s' souboru `%1$s' není známa; zkusím C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "vstupní soubor není zadán"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3456,58 +3483,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3516,14 +3543,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3531,7 +3558,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3540,74 +3567,89 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3615,30 +3657,30 @@ msgid ""
 msgstr ""
 
 # src/xget-lex.c:150
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "standardní vstup"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: upozornìní: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3647,34 +3689,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3683,15 +3725,31 @@ msgid ""
 msgstr ""
 
 # src/xgettext.c:1342
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "jazyk `%s' není znám"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+# src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
+# src/msgunfmt.c:175 src/xgettext.c:394
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "  Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "  Toto je volné programové vybavení; podmínky pro kopírování a "
+#~ "roz¹iøování\n"
+#~ "naleznete ve zdrojových textech. Toto programové vybavení je zcela BEZ "
+#~ "ZÁRUKY,\n"
+#~ "a to i bez záruky PRODEJNOSTI nebo VHODNOSTI PRO NÌJAKÝ KONKRÉTNÍ ÚÈEL.\n"
+
 #~ msgid "%s: warning: "
 #~ msgstr "%s: upozornìní: "
 
diff --git a/gettext-tools/po/da.po b/gettext-tools/po/da.po
index b855eb1dc..ab35c5144 100644
--- a/gettext-tools/po/da.po
+++ b/gettext-tools/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.12-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2003-03-08 19:32+0200\n"
 "Last-Translator: Keld Simonsen \n"
 "Language-Team: Danish \n"
@@ -18,87 +18,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, fuzzy, c-format
 msgid "invalid argument %s for %s"
 msgstr "Ugyldigt argument '%s' for '%s'"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, fuzzy, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "flertydigt argument '%s' for '%s'"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Gyldige argumenter er:"
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan ikke finde et midlertidigt katalog, prøv at sætte $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'"
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan ikke oprette uddatafil '%s'"
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fejl ved læse-åbning af '%s'"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "Kan ikke åbne sikkerhedskopi-fil '%s' for skrivning"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "fejl ved læsning af '%s'"
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "fejl efter læsning af '%s'"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() mislykkedes"
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Javakompilator ikke fundet, forsøg at installere gcj eller sæt $JAVAC"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, fuzzy, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -108,120 +109,120 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s-underproces mislykkedes"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tilvalget '%s' kan betyde flere ting\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '--%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget `%c%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tilvalget `%s' kræver et argument\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ukendt tilvalg `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ukendt tilvalg `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ulovligt tilvalg -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ugyldigt tilvalg -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tilvalget '%c' kræver et argument\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tilvalget '-W %s' er flertydigt\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "kunne ikke oprette '%s'"
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Javakompilator ikke fundet, forsøg at installere gcj eller sæt $JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtuel Javamaskine ikke fundet, forsøg at installere gij eller sæt $JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "I/O-fejl i %s-underproces"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "ikke mere ledig hukommelse"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "kan ikke oprette datakanal '%s'"
@@ -245,44 +246,44 @@ msgstr "kan ikke oprette datakanal '%s'"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, fuzzy, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "%s-underproces fejlede med slutstatus %d"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s underproces"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s underproces fik et dødeligt signal %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\""
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
@@ -290,211 +291,218 @@ msgstr ""
 "formateringsdirektiv for argument \"%u\", som i \"%s\", findes ikke i \"msgid"
 "\""
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formateringsdirektiv for argument %u findes ikke i \"%s\""
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "formatangivelser i 'msgid' og '%s' for argument %u er ikke ens"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "antal af formatangivelser i 'msgid' og '%s' er ikke overensstemmende"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -502,26 +510,26 @@ msgid ""
 msgstr ""
 "formateringsdirektiv for argument {%u}, som i \"%s\", findes ikke i \"msgid\""
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "formateringsdirektiv for argument {%u} findes ikke i \"%s\""
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "formatangivelser i 'msgid' og '%s' for argument {%u} er ikke det samme"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -532,82 +540,82 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "formatangivelser i 'msgid' og '%s' er ikke de samme"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "formateringsdirektiv i \"%s\" er ikke en delmængde af dem i \"msgid\""
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formateringsdirektiv for argument \"%s\" findes ikke i \"%s\""
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -616,7 +624,7 @@ msgstr ""
 "formateringsdirektiv i \"msgid\" tager en afbildning, dem i \"%s\" tager en "
 "tuppel"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -625,7 +633,7 @@ msgstr ""
 "formateringsdirektiv i \"msgid\" tager en tuppel, de i \"%s\" tager en "
 "afbildning"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -634,120 +642,119 @@ msgstr ""
 "formateringsdirektiv for argument \"%s\", som i \"%s\", findes ikke i \"msgid"
 "\""
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr ""
 "formateringsdirektiv i \"msgid\" og \"%s\" for argument \"%s\" er ikke ens"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"Dette er frit programmel; se kildekoden for kopieringsbetingelser.  Der er\n"
-"INGEN garanti; heller ikke for SALGBARHED eller EGNETHED FOR NOGET SÆRLIGT\n"
-"FORMÅL.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "For mange argumenter"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv '%s --help' for yderligere oplysninger.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Brug: %s [TILVALG]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Skriv maskinens værtsnavn.\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, fuzzy, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -760,34 +767,34 @@ msgstr ""
 "alias\n"
 "  -i, --ip-address      adresser for værtsnavnet\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, fuzzy, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -795,42 +802,47 @@ msgstr ""
 "  -h, --help                  vis denne hjælp og afslut\n"
 "  -V, --version               vis versionsinformation og afslut\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "Rapportér fejl på engelsk til .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "kunne ikke hente værtsnavn"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "Højst én inddatalinje tilladt"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s udelukker hinanden"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -839,10 +851,10 @@ msgstr ""
 "Filtrerer beskederne i et beskedskatalog efter deres attributter og\n"
 "manipulerer attributterne.\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -851,30 +863,30 @@ msgstr ""
 "tilsvarende\n"
 "korte tilvalg.\n"
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "ingen inddatafil angivet"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, fuzzy, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
@@ -882,24 +894,24 @@ msgstr ""
 "  FIL ...                  .mo-infiler\n"
 "Hvis ingen indfil er givet eller hvis den er - læses standard-ind.\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, fuzzy, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -910,203 +922,203 @@ msgstr ""
 "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet,\n"
 "eller hvis den er angivet til - .\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1119,31 +1131,31 @@ msgstr ""
 "      --no-wrap               ombryd ikke lange beskeder, længere end\n"
 "                              uddatasidens bredde, til flere linjer\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Umuligt udvælgelseskriterium angivet (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1165,51 +1177,51 @@ msgstr ""
 "men hvis --use-first er angivet, vil de blive taget fra den første PO-fil,\n"
 "der definerer dem. Filpositioner fra alle PO-filer sammenbringes.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1217,39 +1229,53 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "ingen filer angivet som inddata"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "der kræves netop to inddatafiler"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Brug: %s [TILVALG] gammel.po ny.pot\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1268,22 +1294,22 @@ msgstr ""
 "mellem msgid-tekststrengene, benyttes en upræcis sammenligningsmetode til at\n"
 "give bedre fejlretningsinformation.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, fuzzy, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1292,7 +1318,7 @@ msgstr ""
 "Bearbejdningsvarianter:\n"
 "  -m, --multi-domain          brug ref.pot til hvert domæne i def.po\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
@@ -1302,54 +1328,54 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "advarsel: denne tekst bliver ikke brugt"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne tekst bruges, men er ikke erklæret..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...men denne tekst ligner"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne tekst er brugt, men ikke erklæret i %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "advarsel: denne tekst bliver ikke brugt"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fandt %d fatal fejl"
 msgstr[1] "fandt %d fatale fejl"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "Mindst to filer skal angives"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1369,30 +1395,30 @@ msgstr ""
 "men kun fra den første PO-fil, der definerer dem. Filpositioner fra alle PO-filer\n"
 "vil blive sammenbragt.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konverterer et beskedskatalog til en anden tegnkodning.\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, fuzzy, c-format
 msgid "Conversion target:\n"
 msgstr "konverteringsfejl"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, fuzzy, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
@@ -1400,46 +1426,46 @@ msgstr ""
 "  -t, --to-code=NAVN          Kodning for uddata\n"
 "Standardværdi er nuværende locales kodning.\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "ingen inddatafil angivet"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr "der kræves præcist én inddatafil"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Brug: %s [FLAG] INDFIL\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1452,22 +1478,22 @@ msgstr ""
 "Uoversatte poster gives en oversættelse som er identisk med msgid og\n"
 "markeres som uafklaret.\n"
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr "kommandonavn mangler"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Brug: %s [TILVALG] KOMMANDO [KOMMANDOTILVALG]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1482,7 +1508,7 @@ msgstr ""
 "bliver uddata fra msgexec.  Slutstatusværdien for msgexec er den største\n"
 "slutstatusværdi fra alle kommandokørslerne.\n"
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1492,42 +1518,42 @@ msgstr ""
 "af et nultegn. Uddata for \"msgexec 0\" er brugbart som inddata for\n"
 "\"xargs -O\"\n"
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr "skrivning til standard ud mislykkedes"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "skrivning til %s-underproces mislykkedes"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr "filternavn mangler"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "mindst et sed-skript skal angives"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Brug: %s [FLAG] FILTER [FILTERFLAG]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Udfører et filter på alle oversættelser i et beskedskatalog.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1536,18 +1562,18 @@ msgstr ""
 "FILTER kan være hvilket som helst program som læser en oversættelse fra\n"
 "standard ind og skriver den ændrede oversættelse til standard ud.\n"
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1555,123 +1581,123 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "kan ikke opsætte ikke-blokerende I/O til %s-underproces"
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "kommunikation med %s-underproces mislykkedes"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "læsning fra %s-underproces mislykkedes"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s-underproces afsluttede med slutstatus %d"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentet til %s bør være et enkelt skilletegn"
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s kræver at \"-d katalog\" angives"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s kræver en \"-l lokale\"-angivelse"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s er kun gyldig med %s eller %s"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s er kun gyldig med %s eller %s"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversat tekst"
 msgstr[1] "%d oversatte tekster"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d uafklaret oversættelse"
 msgstr[1] ", %d uafklarede oversættelser"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversat tekst"
 msgstr[1] ", %d uoversatte tekster"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Brug: %s [FLAG] filnavn.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generér binært tekstkatalog fra oversættelsebeskrivelse i kildetekst.\n"
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1681,17 +1707,17 @@ msgstr ""
 "korte tilvalg.\n"
 "Tilvarende gælder for valgfri argumenter.\n"
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, fuzzy, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1701,14 +1727,14 @@ msgstr ""
 "  -j, --java               Javatilstand: generér en Java ResourceBundle-"
 "klasse\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
@@ -1718,7 +1744,7 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1730,13 +1756,13 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, fuzzy, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
@@ -1746,41 +1772,41 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1796,48 +1822,48 @@ msgstr ""
 "adskilt med en understreg. Flaget -d er obligatorisk. Klassen skrives\n"
 "i det opgivne katalog.\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "ingen inddatafil angivet"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1845,33 +1871,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1879,12 +1905,12 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, fuzzy, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -1893,7 +1919,7 @@ msgstr ""
 "  -a, --alignment=TAL         læg strenge på lige TAL byte (normalt: %d)\n"
 "      --no-hash               binærfil indholder ikke hashtabellen\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, fuzzy, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -1902,79 +1928,79 @@ msgstr ""
 "  -a, --alignment=TAL         læg strenge på lige TAL byte (normalt: %d)\n"
 "      --no-hash               binærfil indholder ikke hashtabellen\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "advarsel: PO-filhoved mangler eller ugyldigt\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "advarsel: tegnsætskonvertering vil ikke virke\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "advarsel: PO-filhoved er uafklaret\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "advarsel: ældre versioner af msgfmt vil give en fejl for dette\n"
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domænet '%s' kan ikke bruges som filnavn"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domænet '%s' er ikke brugbart som filnavn. Vil bruge præfiks istedet"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s'-kommando ignoreres"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "tom `msgstr'-kommando ignoreret"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "\"fuzzy\" `msgstr'-tekst ignoreret"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s: advarsel: kildetekstfilen indeholder uafklarede oversættelser (fuzzy)"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fejl ved læsning af '%s'"
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -1982,7 +2008,7 @@ msgid ""
 msgstr ""
 "flaget \"%c\" kan ikke bruges førend \"K\" eller \"T\" er blevet angivet"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -1991,7 +2017,7 @@ msgstr ""
 "Udtrækker alle beskeder i et beskedskatalog som matcher et vist\n"
 "mønster eller hører til en given kildetekstfil.\n"
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2058,23 +2084,23 @@ msgstr ""
 "  -f, --file=FIL              hent MØNSTER fra FIL\n"
 "  -i, --ignore-case           versalufølsomt\n"
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2084,7 +2110,7 @@ msgstr ""
 "LANG som beskrevet i filen ABOUT-NLS. Dette er nødvendigt for at\n"
 "du kan teste dine oversættelser.\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2095,12 +2121,12 @@ msgstr ""
 "Angiv locale med flaget --locale eller\n"
 ".po-udfilen med flaget --output-file.\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "Oprettede %s.\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2109,12 +2135,12 @@ msgstr ""
 "Opretter en ny PO-fil og initierer metainformation med værdier fra\n"
 "brugerens miljøvariabler.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, fuzzy, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2126,12 +2152,12 @@ msgstr ""
 "Hvis ingen indfil angives, søges efter POT-filen i aktuelt katalog.\n"
 "Hvis den er - læses standard ind.\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, fuzzy, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2143,18 +2169,18 @@ msgstr ""
 "brugerens\n"
 "indstilling af locale. Hvis den er - skrives resultaterne på standard ud.\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2162,12 +2188,12 @@ msgstr ""
 "Fandt mere end en .pot-fil.\n"
 "Angiv .pot-indfil med flaget --input.\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "fejl ved læsning af aktuelt katalog"
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2175,14 +2201,14 @@ msgstr ""
 "Fandt ingen .pot-fil i aktuelt katalog.\n"
 "Angiv .pot-indfil med flaget --input.\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s-underproces fejlede med slutstatus %d"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2197,28 +2223,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "Danske oversættelser for pakke %s"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "nuværende tegnsæt \"%s\" er ikke et portabelt kodningsnavn"
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "to forskellige tegnsæt \"%s\" og \"%s\" i indfilen"
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "indfilen \"%s\" mangler en indgang i hovedet med angivelse af tegnsæt"
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2227,19 +2253,19 @@ msgstr ""
 "domæne \"%s\" i indfil \"%s\" mangler en indgang i hovedet med angivelse af "
 "tegnsæt"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "måltegnsæt \"%s\" er ikke et portabelt kodningsnavn"
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "advarsel: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2248,7 +2274,7 @@ msgstr ""
 "Indfiler har beskeder med flere kodninger, deriblandt UTF-8.\n"
 "Konverterer resultatet til UTF-8.\n"
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2260,7 +2286,7 @@ msgstr ""
 "Konverterer resultatet til UTF-8.\n"
 "Brug flaget --to-code for at vælge en anden kodning.\n"
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2269,7 +2295,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2282,12 +2308,12 @@ msgstr ""
 "Resultatet for \"%s\" kan blive forkert.\n"
 "Mulige måder at omgå problemet er:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Sæt LC_ALL til et locale med kodning %s.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2298,7 +2324,7 @@ msgstr ""
 "  udfør derefter \"%s\",\n"
 "  konvertér så tilbage til %s med \"msgconv\".\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2311,7 +2337,7 @@ msgstr ""
 "  udfør derefter \"%s\"\n"
 "  konvertér så tilbage til %s med \"msgconv\".\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2322,77 +2348,77 @@ msgstr ""
 "Resultatet for \"%s\" kan blive forkert.\n"
 "En mulig måde at omgå problemet er at sætte LC_ALL=C.\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "flertalsudtryk kan give negative værdier"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu men flertalsudtryk kan give værdier op til %lu"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "flertalsudtryk kan give division med nul"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "flertalsudtryk kan give heltalsoverløb"
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "flertalsudtryk kan give aritmetiske fejl, måske division med nul"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Prøv at bruge det følgende, gældende for %s:\n"
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "tekstkatalog har oversættelser med flertalsform..."
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...men headerindgange mangler attribut af type \"plurals=UDTRYK\""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...men headerindgange mangler attribut af type \"plurals=HELTAL\""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "ugyldig nplurals-værdi"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "ugyldigt flertalsudtryk"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...men nogen tekster har kun én flertalsform"
 msgstr[1] "...men nogen tekster har kun %lu flertalsformer"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...men nogen tekster har én flertalsform"
 msgstr[1] "...men nogen tekster har %lu flertalsformer"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2400,81 +2426,81 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer, men mangler en "
 "headerindgang med \"Plural-Forms: nplurals=HELTAL; plural=UDTRYK;\""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "'msgid' og 'msgid_plural'-teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' og `msgstr[%u]'-teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' og `msgstr' teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' og `msgid_plural'-teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' og `msgstr[%u]'-teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' og `msgstr' teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "flertalsbehandling er en GNU gettext-udvidelse"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr mangler mærket \"%c\" for tastaturgenvej"
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr har for mange mærker \"%c\" for tastaturgenveje"
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "feltet `%s' mangler i hovedet\n"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "feltet '%s' i hovedet bør starte ved linjens begyndelse\n"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "nogle felter i hovedet har stadig den oprindelige standardværdi\n"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "feltet `%s' har stadig den oprindelige standardværdi\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "fejl ved læse-åbning af '%s'"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "indfilen mangler en indgang i hovedet med angivelse af tegnsæt"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2483,15 +2509,15 @@ msgstr ""
 "Kan ikke konvertere fra '%s' til '%s'. %s bygger på iconv(), og iconv() "
 "understøtter ikke denne konvertering."
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2636,17 +2662,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "denne tekst burde definere flertalsformer"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "denne tekst burde ikke definere flertalsformer"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2655,26 +2681,26 @@ msgstr ""
 "%sLæste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler %"
 "ld, forældede %ld.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " afsluttet.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s og udtrykkelige filnavne udelukker hinanden"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Brug: %s [TILVALG] [FIL]...\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Konvertér et binær beskedskatalog til en .po-fil af Uniforum-type\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, fuzzy, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2684,7 +2710,7 @@ msgstr ""
 "  -j, --java               Javatilstand: generér en Java ResourceBundle-"
 "klasse\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
@@ -2694,7 +2720,7 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2706,7 +2732,7 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, fuzzy, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2717,17 +2743,17 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2740,41 +2766,41 @@ msgstr ""
 "Klassenavnet bestemmes ved at tilføje localenavnet til ressourcenavnet\n"
 "adskilt med en understreg. Klassen findes med hjælp af CLASSPATH.\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "ingen inddatafil angivet"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2796,12 +2822,12 @@ msgstr ""
 "oversættelse. Filpositioner samles sammen.\n"
 "Når flaget --unique angives fjernes alle gentagede.\n"
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, fuzzy, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2812,12 +2838,12 @@ msgstr ""
 "  -u, --unique                   skriv kun unikke beskeder, gentagede "
 "fjernes\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2826,7 +2852,7 @@ msgstr ""
 "Tegnsæt '%s' er ikke et flytbart kodningsnavn.\n"
 "Tekstkonvertering til brugers tegnsæt virker muligvis ikke.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2835,7 +2861,7 @@ msgstr ""
 "Tegnsæt '%s' er ikke understøttet. %s bygger på iconv(),\n"
 "og iconv() understøtter ikke '%s'.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2843,15 +2869,15 @@ msgstr ""
 "Installering af GNU libiconv og geninstallering af GNU gettext\n"
 "vil løse dette problem.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Fortsætter alligevel, forvent fortolkningsfejl."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Fortsætter alligevel."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2860,7 +2886,7 @@ msgstr ""
 "Tegnsæt '%s' er ikke understøttet. %s bygger på iconv(),\n"
 "Denne version er bygget uden iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2868,150 +2894,150 @@ msgstr ""
 "Tegnsæt mangler i hoved.\n"
 "Tekstkonvertering til brugers tegnsæt vil ikke virke.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "inkonsistent brug af #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "'msgstr[]'-afsnit mangler"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "'msgstr_plural'-afsnit mangler"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "'msgstr'-afsnit mangler"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "første flertalsform har indeks, der ikke er nul"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "flertalsform har forkert indeks"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "afbryder kørslen på grund af for mange fejl"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "Ugyldig multibytesekvens"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "Ugyldig multibytesekvens ved slutning på fil"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "Ugyldig multibytesekvens ved slutning på linje"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr "iconv-fejl"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "ukendt nøgleord '%s'"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "ugyldig kontrolsekvens"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "tekststreng ikke afsluttet da filens slutning blev nået"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "tekststreng var ikke afsluttet ved linjeskift"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fil må ikke indeholde 'domain'-kommandoer"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "tekst erklæret mere end en gang"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "... her er den første erklæring"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "filen '%s' er afkortet"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "filen '%s' er ikke i GNU .mo-format"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "filen '%s' indeholder en ikke-NUL-afsluttet streng, ved %s"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%d: advarsel: ugyldigt ISO 10646-tegn"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s%s: advarsel: "
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Skrevet af %s.\n"
@@ -3020,43 +3046,43 @@ msgstr "Skrevet af %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "fejl ved læse-åbning af '%s'"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr "forventede to argumenter"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Brug: %s [TILVALG] URL FIL\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3065,24 +3091,24 @@ msgstr ""
 "Henter og udskriver indholdet af en URL. Hvis URL'en ikke kan hentes bruges\n"
 "den lokale fil FIL i stedet.\n"
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr "fejl ved skrivning af standard-uddata"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
@@ -3091,14 +3117,14 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 #, fuzzy
 msgid ""
 "message catalog has plural form translations, but the output format does not "
@@ -3107,70 +3133,65 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikke oprette uddatafil '%s'"
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "standard-uddata"
 
-#: src/write-csharp.c:618
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"beskedkatalog har oversættelser med flertalsformer,\n"
-"men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "kunne ikke oprette '%s'"
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, fuzzy, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "oversættelse af Java-klasse mislykkedes, prøv gerne --verbose eller sæt "
 "$JAVAC"
 
-#: src/write-java.c:920
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
 msgstr ""
-"beskedkatalog har oversættelser med flertalsformer,\n"
-"men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
+"oversættelse af Java-klasse mislykkedes, prøv gerne --verbose eller sæt "
+"$JAVAC"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ikke et gyldigt Java-klassenavn: %s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "oversættelse af Java-klasse mislykkedes, prøv gerne --verbose eller sæt "
 "$JAVAC"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"oversættelse af Java-klasse mislykkedes, prøv gerne --verbose eller sæt "
+"$JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "fejl opstået ved skrive-åbning af '%s'"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "oversættelige tekster må ikke indeholde `\\%c'-escapesekvensen"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3183,7 +3204,7 @@ msgstr ""
 "som er et andet end dit. Forsøg at bruge en ren ASCII-msgid i stedet.\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3196,7 +3217,7 @@ msgstr ""
 "som er et andet end dit. Forsøg at bruge en ren ASCII-msgid i stedet.\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
@@ -3205,7 +3226,7 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3213,19 +3234,19 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3234,7 +3255,7 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
@@ -3243,7 +3264,7 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3252,7 +3273,7 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3260,27 +3281,27 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: regulært udtryk ikke afsluttet"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel:  tegnkonstant ikke afsluttet korrekt"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, fuzzy, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3289,7 +3310,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3298,7 +3319,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3307,7 +3328,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3316,7 +3337,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3325,12 +3346,12 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "iconv-fejl"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3339,32 +3360,32 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: ugyldigt ISO 10646-tegn"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3373,42 +3394,47 @@ msgstr ""
 "Sproget 'glade' er ikke understøttet. %s bygger på expat,\n"
 "Denne version er bygget uden expat.\n"
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: advarsel: streng ikke afsluttet"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: ugyldig streng-definition"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, fuzzy, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3418,7 +3444,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3428,7 +3454,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3438,7 +3464,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3448,7 +3474,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3458,7 +3484,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3468,79 +3494,79 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ugyldig streng-definition"
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: mangler tal efter #"
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ugyldigt streng-udtryk"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikke benyttes når uddata sendes til standard-uddata"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbejde uden nogen nøgleord at kigge efter"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "advarsel: ukendt type for fil `%s' med endelse `%s'; C benyttes i stedet"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Udtræk oversættelige strenge fra givne indfiler.\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "ingen inddatafil angivet"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3559,19 +3585,19 @@ msgstr ""
 "  -C, --c++                      kort skrivemåde for --language=C++\n"
 "Som standard antages sproget ud fra endelsen på inddatafilen.\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, fuzzy, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3582,22 +3608,22 @@ msgstr ""
 "                                   (undtagen for Python, Tcl, Glade)\n"
 "Som standard antages inddatafilerne at være i ASCII.\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, fuzzy, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3608,17 +3634,17 @@ msgstr ""
 "  -c, --add-comments[=MÆRKE]     placér kommentarafsnit for MÆRKE (eller \n"
 "                                 de foregående nøgleordslinjer) i uddata\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3634,14 +3660,14 @@ msgstr ""
 "  -C, --c++                      kort skrivemåde for --language=C++\n"
 "Som standard antages sproget ud fra endelsen på inddatafilen.\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3649,7 +3675,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3665,17 +3691,17 @@ msgstr ""
 "  -C, --c++                      kort skrivemåde for --language=C++\n"
 "Som standard antages sproget ud fra endelsen på inddatafilen.\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, fuzzy, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
@@ -3685,12 +3711,22 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+"Kørselstilstand:\n"
+"  -j, --java                  Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+"      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
+
+#: src/xgettext.c:863
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
@@ -3700,79 +3736,89 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "standard-inddata"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: advarsel: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, fuzzy, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3781,7 +3827,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3791,27 +3837,27 @@ msgstr ""
 "gettext(\"\") returnerer hovedet med metainformation,\n"
 "ikke den tomme streng.\n"
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "flertydigt argument '%s' for '%s'"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "flertydigt argument '%s' for '%s'"
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "flertydigt argument '%s' for '%s'"
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3823,15 +3869,45 @@ msgstr ""
 "variablen MSGID_BUGS_ADDRESS dér; ellers angiv\n"
 "tilvalget --msgid-bugs-address på kommandolinjen.\n"
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "ukendt sprog '%s'"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright © %s Free Software Foundation, Inc.\n"
+#~ "Dette er frit programmel; se kildekoden for kopieringsbetingelser.  Der "
+#~ "er\n"
+#~ "INGEN garanti; heller ikke for SALGBARHED eller EGNETHED FOR NOGET "
+#~ "SÆRLIGT\n"
+#~ "FORMÅL.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "beskedkatalog har oversættelser med flertalsformer,\n"
+#~ "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "beskedkatalog har oversættelser med flertalsformer,\n"
+#~ "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
+
 #~ msgid "%s: warning: "
 #~ msgstr "%s: advarsel: "
 
diff --git a/gettext-tools/po/de.po b/gettext-tools/po/de.po
index 7d0901946..4a32f23ea 100644
--- a/gettext-tools/po/de.po
+++ b/gettext-tools/po/de.po
@@ -81,7 +81,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-05-15 02:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-06-28 16:37+0200\n"
 "Last-Translator: Karl Eichwalder \n"
 "Language-Team: German \n"
@@ -90,90 +90,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "ungültiges Argument %s für %s"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "mehrdeutiges Argument %s für %s"
 
-#: gnulib-lib/argmatch.c:154
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Gültige Argumente sind:"
 
-#: gnulib-lib/clean-temp.c:334
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "temporäres Verzeichnis ist nicht zu finden; bitte setzen Sie $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:348
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "es ist nicht möglich, ein temporäres Verzeichnis mittels\n"
 "der Vorlage »%s« anzulegen"
 
-#: gnulib-lib/clean-temp.c:444
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "Temporäre Datei %s kann nicht entfernt werden"
 
-#: gnulib-lib/clean-temp.c:459
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "Temporäres Verz/Verzeichnis %s kann nicht entfernt werden"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "Fehler beim Schreiben"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:55 src/msggrep.c:245
-#: src/open-catalog.c:122 src/read-mo.c:253 src/read-tcl.c:125
-#: src/urlget.c:201 src/xgettext.c:1750 src/xgettext.c:1763
-#: src/xgettext.c:1773
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
 
-#: gnulib-lib/copy-file.c:74
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "Öffnen der Sicherungsdatei »%s« zum Schreiben fehlgeschlagen"
 
-#: gnulib-lib/copy-file.c:82 src/urlget.c:213
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
 
-#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:92
-#: gnulib-lib/copy-file.c:131
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "Fehler beim Schreiben von »%s«"
 
-#: gnulib-lib/copy-file.c:94 gnulib-lib/copy-file.c:133 src/urlget.c:223
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "Fehler nach dem Lesen von »%s«"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:840
-#: src/msginit.c:908 src/msginit.c:1068 src/msginit.c:1151
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() fehlgeschlagen"
 
-#: gnulib-lib/csharpcomp.c:540
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C#-Compiler nicht gefunden; bitte »pnet« installieren"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Virtuelle C#-Maschine nicht gefunden; bitte »pnet« installieren"
@@ -182,122 +182,122 @@ msgstr "Virtuelle C#-Maschine nicht gefunden; bitte »pnet« installieren"
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:261 gnulib-lib/execute.c:303
-#: gnulib-lib/pipe.c:230 gnulib-lib/pipe.c:348 gnulib-lib/pipe.c:408
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Subprozeß %s fehlgeschlagen"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option »%s« ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: Option »--%s« erwartet kein Argument\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: Option »%c%s« erwartet kein Argument\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: Option »%s« erwartet ein Argument\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option »--%s«\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option »%c%s«\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: unzulässige Option -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Option erwartet ein Argument -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: Option »-W %s« erwartet kein Argument\n"
 
-#: gnulib-lib/javacomp.c:128 gnulib-lib/javacomp.c:142
-#: gnulib-lib/javacomp.c:158
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "ungültiges Argument source_version für compile_java_class"
 
-#: gnulib-lib/javacomp.c:173 gnulib-lib/javacomp.c:194
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ungültiges Argument target_version für compile_java_class"
 
-#: gnulib-lib/javacomp.c:505 src/write-csharp.c:714 src/write-java.c:988
-#: src/write-java.c:1000
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Fehler beim Anlegen von »%s«"
 
-#: gnulib-lib/javacomp.c:512 src/write-catalog.c:254 src/write-catalog.c:318
-#: src/write-csharp.c:723 src/write-java.c:1009 src/write-mo.c:812
-#: src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Fehler beim Schreiben von Datei »%s«"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Java-Compiler nicht gefunden; bitte »gcj« installieren oder $JAVAC setzen"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtuelle Java-Maschine nicht gefunden; bitte »gcj« installieren oder\n"
 "$JAVA setzen"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:848 src/msginit.c:916
-#: src/msginit.c:1076
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Subprozeß %s mit Ein-/Ausgabefehler"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:39 src/msgl-check.c:452 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:436 libgettextpo/gettext-po.c:1245
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "virtueller Speicher aufgebraucht"
 
-#: gnulib-lib/pipe.c:156 gnulib-lib/pipe.c:159 gnulib-lib/pipe.c:263
-#: gnulib-lib/pipe.c:266
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "Es ist nicht möglich, eine Pipe zu einzurichten"
@@ -321,75 +321,75 @@ msgstr "Es ist nicht möglich, eine Pipe zu einzurichten"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr "»"
 
-#: gnulib-lib/quotearg.c:230
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr "«"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandle ist mit dem Exitcode 0x%08x fehlgeschlagen"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle fehlgeschlagen"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "Subprozeß %s"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "Subprozeß %s hat das fatale Signal %d erhalten"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 "»%s« ist ein ungültiges Formatelement %s, im Vergleich zu »msgid«. Der Grund: %"
 "s"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:624 src/format-librep.c:313
-#: src/format-pascal.c:402 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:138 src/format-tcl.c:391 src/format-ycp.c:145
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "eine Formatspezifikation für Argument %u, wie in »%s«, fehlt in »msgid«"
 
-#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:634 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
-#: src/format-qt.c:137 src/format-tcl.c:401 src/format-ycp.c:144
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument »%u« fehlt in »%s«"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:911
-#: src/format-elisp.c:379 src/format-gcc-internal.c:654
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
-#: src/format-php.c:381 src/format-python.c:511 src/format-tcl.c:421
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr ""
 "Formatspezifikation in »msgid« und »%s« für Argument %u sind nicht identisch"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Die %u. Formatanweisung beginnt mit |, aber endet nicht mit |."
 
-#: src/format-c.c:182
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -399,42 +399,42 @@ msgstr ""
 "einer Formatspezifikation. Die gültigen Makronamen sind in ISO C 99 "
 "Abschnitt 7.8.1 aufgeführt."
 
-#: src/format-c.c:589
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "In der %u. Formatanweisung folgt dem Wort nach »<« kein »>«."
 
-#: src/format-c.c:815
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Die Zeichenkette bezieht sich auf das %u. Argument, ignoriert aber das %u. "
 "Argument."
 
-#: src/format-c.c:902 src/format-csharp.c:207 src/format-python.c:502
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "Anzahl der Formatspezifikationen in »msgid« und »%s« stimmt nicht überein"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "In der %u. Formatanweisung folgt der »{« kein nummeriertes Argument."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "In der %u. Formatanweisung folgt dem »,« keine Zahl."
 
-#: src/format-csharp.c:131 src/format-java.c:192
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 "Die Zeichenkette endet mitten in einer Anweisung: »{« ohne übereinstimmende "
 "»}« gefunden."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
@@ -442,13 +442,13 @@ msgstr ""
 "Die %u. Formatanweisung endet mit dem ungültigen Zeichen '%c' anstatt einer\n"
 "'}'."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 "Die %u. Formatanweisung endet mit einem ungültigen Zeichen anstatt einer '}'."
 
-#: src/format-csharp.c:162 src/format-java.c:347
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
@@ -456,23 +456,23 @@ msgstr ""
 "Die Zeichenkette beginnt mitten in einer Anweisung: »}« ohne übereinstimmende "
 "»{« gefunden."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 "Die Zeichenkette beinhaltet eine einzelne '}' nach der %u. Formatanweisung."
 
-#: src/format-gcc-internal.c:254
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "In der %u. Formatanweisung ist die Kombination der Flags ungültig."
 
-#: src/format-gcc-internal.c:291 src/format-gcc-internal.c:397
+#: src/format-gcc-internal.c:290
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "In der %u. Formatanweisung sind Flags vor »%c« nicht erlaubt."
 
-#: src/format-gcc-internal.c:333
+#: src/format-gcc-internal.c:332
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -480,31 +480,38 @@ msgid ""
 msgstr ""
 "In der %u. Formatanweisung ist das 0. Argument keine positive Ganzzahl."
 
-#: src/format-gcc-internal.c:405
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "In der %u. Formatanweisung sind Flags vor »%c« nicht erlaubt."
+
+#: src/format-gcc-internal.c:404
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "In der %u. Formatanweisung ist das %d. Argument negativ."
 
-#: src/format-gcc-internal.c:460
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "In der %u. Formatanweisung sind Flags vor »%c« nicht erlaubt."
 
-#: src/format-gcc-internal.c:672
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "»msgid« verwendet %%m, aber »%s« nicht"
 
-#: src/format-gcc-internal.c:675
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "»msgid« verwendet nicht %%m, aber »%s« verwendet %%m"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Die Zeichenkette endet mitten in einer Formatanweisung."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -512,14 +519,14 @@ msgstr ""
 "Die Zeichenkette bezieht sich auf Argumente mittels absoluter Nummerierung "
 "der Argumente und mittels nicht nummerierter Argumentspezifikationen."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 "In der %u. Formatanweisung ist das 0. Argument keine positive Ganzzahl."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
@@ -528,7 +535,7 @@ msgstr ""
 "In der %u. Formatanweisung ist das 0. Argument für die Breite keine positive "
 "Ganzzahl."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
@@ -537,7 +544,7 @@ msgstr ""
 "In der %u. Formatanweisung ist das 0. Genauigkeitsargument keine positive "
 "Ganzzahl."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
@@ -546,7 +553,7 @@ msgstr ""
 "In der %u. Formatanweisung ist das Zeichen »%c« keine gültige "
 "Konvertierspezifikation."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -555,14 +562,14 @@ msgstr ""
 "Das Zeichen, das die %u. Formatanweisung terminiert, ist keine gültige "
 "Konvertierspezifikation."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 "Die Zeichenkette bezieht sich auf das %u. Argument in einer nicht "
 "kompatiblen Weise."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -571,12 +578,12 @@ msgstr ""
 "In der %u. Formatanweisung ist die Unterzeichenkette »%s« kein gültiger "
 "Datums- bzw. Zeitstil."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "In der %u. Formatanweisung folgt dem »%s« kein Komma."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
@@ -584,7 +591,7 @@ msgstr ""
 "In der %u. Formatanweisung ist die Unterzeichenkette »%s« kein gültiger "
 "Zahlenstil."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -593,12 +600,12 @@ msgstr ""
 "In der %u. Formatanweisung folgt dem nummerierten Argument kein Komma und "
 "keins von »%s«, »%s«, »%s«, »%s«."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "In der %u. Formatanweisung beinhaltet eine Choice keine Zahl."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -607,7 +614,7 @@ msgstr ""
 "In der %u. Formatanweisung beinhaltet eine Choice eine Zahl der keins von "
 "'<', '#' or '%s' folgt."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -615,12 +622,12 @@ msgid ""
 msgstr ""
 "eine Formatspezifikation für Argument {%u}, wie in »%s«, fehlt in »msgid«"
 
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument {%u} fehlt in »%s«"
 
-#: src/format-java.c:776
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -628,8 +635,8 @@ msgstr ""
 "Formatspezifikationen in »msgid« und »%s« für Argument {%u} sind nicht "
 "identisch"
 
-#: src/format-lisp.c:2338 src/format-lisp.c:2350 src/format-scheme.c:2364
-#: src/format-scheme.c:2376
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -638,7 +645,7 @@ msgstr ""
 "In der %u. Formatanweisung ist der %u. Parameter vom Typ '%s', aber es wird "
 "ein Parameter vom Typ '%s' erwartet."
 
-#: src/format-lisp.c:2373 src/format-scheme.c:2399
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -653,34 +660,34 @@ msgstr[1] ""
 "In der %u. Formatanweisung sind zo viele Parameter angegeben; es werden "
 "höchstens %u Parameter erwartet."
 
-#: src/format-lisp.c:2497 src/format-scheme.c:2500
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "In der %u. Formatanweisung folgt dem '%c' keine Ziffer."
 
-#: src/format-lisp.c:2737 src/format-scheme.c:2755
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "In der %u. Formatanweisung ist das %d. Argument negativ."
 
-#: src/format-lisp.c:2806
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Die Zeichenkette endet mitten in einer ~/.../-Anweisung."
 
 # Bezieht sich auf Klammenpaare -ke-
-#: src/format-lisp.c:2844 src/format-lisp.c:3109 src/format-lisp.c:3226
-#: src/format-lisp.c:3286 src/format-lisp.c:3398 src/format-scheme.c:2841
-#: src/format-scheme.c:3106 src/format-scheme.c:3223 src/format-scheme.c:3321
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "'~%c' ohne zugehörige '~%c' gefunden."
 
-#: src/format-lisp.c:2864 src/format-scheme.c:2861
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "In der %u. Formatanweisung sind die beiden Modifier @ und : angegeben."
 
-#: src/format-lisp.c:2977 src/format-scheme.c:2974
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -689,28 +696,28 @@ msgstr ""
 "In der %u. Formatanweisung folgen dem '~:[' keine zwei Clausen, abgetrennt "
 "durch '~;'."
 
-#: src/format-lisp.c:3327 src/format-scheme.c:3264
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 "In der %u. Formatanweisung wird '~;' an einer ungültigen Stelle verwendet."
 
-#: src/format-lisp.c:3433 src/format-scheme.c:3356
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 "Die Zeichenkette bezieht sich in nicht kompatibler Weise auf ein Argument."
 
-#: src/format-lisp.c:3475 src/format-scheme.c:3398
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "Formatspezifikationen in »msgid« und »%s« sind nicht gleichbedeutend"
 
-#: src/format-lisp.c:3491 src/format-scheme.c:3414
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "Formatspezifikationen in »%s« sind keine Untermenge von deren in »msgid«"
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -719,12 +726,12 @@ msgstr ""
 "In der %u. Formatanweisung ist die Größenspezifikation mit der "
 "Konvertierungsspezifikation »%c« nicht kompatibel."
 
-#: src/format-perl-brace.c:200 src/format-python.c:460 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument »%s« fehlt in »%s«"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -732,7 +739,7 @@ msgstr ""
 "Die Zeichenkette bezieht sich auf Argumente mit bezeichneten Argumenten und "
 "mit unbezeichneten Argumentspezifikationen."
 
-#: src/format-python.c:344
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
@@ -740,7 +747,7 @@ msgstr ""
 "Argument »%s«."
 
 # CHECKIT
-#: src/format-python.c:420
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -749,7 +756,7 @@ msgstr ""
 "Formatspezifikationen in »msgid« erwarten ein Mapping, die in »%s« jedoch ein "
 "Tuple"
 
-#: src/format-python.c:427
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -758,14 +765,14 @@ msgstr ""
 "Formatspezifikationen in »msgid« erwarten ein Tuple, die in »%s« jedoch ein\n"
 "Mapping"
 
-#: src/format-python.c:450 src/format-sh.c:298
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "eine Formatspezifikation für Argument »%s«, wie in »%s«, fehlt in »msgid«"
 
-#: src/format-python.c:480
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
@@ -773,18 +780,20 @@ msgstr ""
 "Formatspezifikationen in »msgid« und »%s« für Argument »%s« stimmen nicht "
 "überein"
 
-#: src/format-qt.c:81
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "Mehrfache Referenzen für %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 "Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem Namen, "
 "dernicht ASCII-kodiert ist."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -793,7 +802,7 @@ msgstr ""
 "Shellklammernsyntax. Diese Syntax wird hier aus Sicherheitsgründen nicht "
 "unterstützt."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
@@ -801,12 +810,12 @@ msgstr ""
 "Die Zeichenkette bezieht sich auf eine Shell-Variable, deren Wert innerhalb "
 "einer Shellfunktion unterschiedlich sein kann."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 "Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem leeren Namen."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
@@ -815,7 +824,7 @@ msgstr ""
 "In der %u. Formatanweisung ist das Zeichen '%c' ist keine Ziffer zwischen 1 "
 "und 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
@@ -824,27 +833,24 @@ msgstr ""
 "Das Zeichen, das die %u. Formatanweisung terminiert, ist keine Ziffer "
 "zwischen 1 und 9."
 
-#: src/hostname.c:179 src/msgattrib.c:326 src/msgcat.c:282 src/msgcmp.c:162
-#: src/msgcomm.c:269 src/msgconv.c:224 src/msgen.c:212 src/msgexec.c:179
-#: src/msgfilter.c:281 src/msgfmt.c:365 src/msggrep.c:399 src/msginit.c:258
-#: src/msgmerge.c:320 src/msgunfmt.c:251 src/msguniq.c:248
-#: src/recode-sr-latin.c:111 src/urlget.c:131 src/xgettext.c:509
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"Dies ist freie Software; in den Quellen befindet sich die Lizenzbedingung.\n"
-"Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
-"die VERWENDBARKEIT ZU EINEN ANGEGEBENEN ZWECK.\n"
 
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
 #: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:263
-#: src/msgmerge.c:325 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:514
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
@@ -852,26 +858,26 @@ msgstr "Geschrieben von %s.\n"
 #. This is a proper name. See the gettext manual, section Names.
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
 #: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:263 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
 #: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:273 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
 #: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
 #: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:347
-#: src/msgmerge.c:446 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:730
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
-#: src/hostname.c:211 src/msginit.c:351 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Aufruf: %s [OPTION]\n"
@@ -908,27 +914,27 @@ msgstr "  -i, --ip-address      Adressen für den Rechnernamen\n"
 
 #: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
 #: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:403
-#: src/msgmerge.c:563 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:880
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative Ausgabe:\n"
 
 #: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
 #: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:405
-#: src/msgmerge.c:565 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:882
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                   diese Hilfe anzeigen und beenden\n"
 
 #: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
 #: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:407
-#: src/msgmerge.c:567 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:884
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
@@ -939,9 +945,9 @@ msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
 #. bugs (typically your translation team's web or email address).
 #: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
 #: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:414
-#: src/msgmerge.c:578 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:891
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr ""
 "Fehler bitte auf Englisch an  melden.\n"
@@ -953,8 +959,8 @@ msgstr ""
 msgid "could not get host name"
 msgstr "es ist nicht möglich, den Rechnernamen (Hostname) herauszufinden"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:151 src/msgfilter.c:211
-#: src/msggrep.c:419 src/msginit.c:196 src/msguniq.c:268
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "höchstens eine Eingabedatei erlaubt"
@@ -963,9 +969,10 @@ msgstr "höchstens eine Eingabedatei erlaubt"
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
 #: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
 #: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:350 src/msgmerge.c:371
-#: src/msgmerge.c:375 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:524 src/xgettext.c:528 src/xgettext.c:535
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s und %s schließen sich gegenseitig aus"
@@ -986,7 +993,7 @@ msgstr ""
 
 #: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
 #: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:361 src/msgmerge.c:467 src/msgunfmt.c:423
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
@@ -997,8 +1004,8 @@ msgstr ""
 
 #: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
 #: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:364 src/msgmerge.c:470
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:748
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "Angaben zu Eingabedateien:\n"
@@ -1010,8 +1017,8 @@ msgstr "  EINGABEDATEI                PO-Eingabedatei\n"
 
 #: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
 #: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:476 src/msguniq.c:336
-#: src/xgettext.c:754
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1028,22 +1035,22 @@ msgstr ""
 
 #: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
 #: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:372 src/msgmerge.c:488 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:759
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "Angaben zu Ausgabedateien:\n"
 
 #: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
 #: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:490 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
 
 #: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:492
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -1163,14 +1170,14 @@ msgstr ""
 
 #: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
 #: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:380 src/msgmerge.c:525
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax der Eingabedatei:\n"
 
 #: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:382 src/msguniq.c:358
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1179,7 +1186,7 @@ msgstr ""
 "                                Java\n"
 
 #: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:384 src/msguniq.c:360
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1190,15 +1197,15 @@ msgstr ""
 
 #: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
 #: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:387 src/msgmerge.c:533 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:838
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "Details zur Ausgabe:\n"
 
 #: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:535 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:840
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1207,8 +1214,8 @@ msgstr ""
 "                              (Vorgabe)\n"
 
 #: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:537 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:842
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1217,28 +1224,28 @@ msgstr ""
 "                              Zeichen in Ausgabe verwenden\n"
 
 #: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:539
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:844
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po            PO-Datei erstellen, auch wenn sie leer ist\n"
 
 #: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:846
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent              Ausgabe eingerückt darstellen\n"
 
 #: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:848
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location         Zeilen mit »#: Datei:Zeilennr.« nicht schreiben\n"
 
 #: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:850
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1247,7 +1254,7 @@ msgstr ""
 "(Vorgabe)\n"
 
 #: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:852
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1255,8 +1262,8 @@ msgstr ""
 "      --strict              .po-Datei streng nach Uniforum-Format erstellen\n"
 
 #: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:393
-#: src/msgmerge.c:549 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
@@ -1264,8 +1271,8 @@ msgstr ""
 "                              ausgeben\n"
 
 #: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:395
-#: src/msgmerge.c:551 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:856
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1274,16 +1281,16 @@ msgstr ""
 "                               erstellen\n"
 
 #: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:397
-#: src/msgmerge.c:553 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:858
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 "  -w, --width=ANZAHL        Breite der Ausgabe auf ANZAHL Spalten festlegen\n"
 
 #: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:399
-#: src/msgmerge.c:555 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:860
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1294,15 +1301,15 @@ msgstr ""
 "                              Zeilen umbrechen\n"
 
 #: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:558 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:863
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output         sortierte Ausgabe erstellen\n"
 
 #: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:560 src/msguniq.c:395
-#: src/xgettext.c:865
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1313,7 +1320,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Auswahlkriterium nicht möglich (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:734
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]...\n"
@@ -1343,19 +1350,19 @@ msgstr ""
 "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n"
 "kumuliert.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:750
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  EINGABEDATEI...             Eingabedateien\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:752
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=DATEI      Namen der Eingabedateien aus DATEI holen\n"
 
 #: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:756
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Wenn die Eingabedatei »-« ist, wird die Standardeingabe gelesen.\n"
@@ -1388,7 +1395,7 @@ msgstr ""
 "                             anfordern, die nur einmal vorkommen\n"
 
 #: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:527
+#: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1398,7 +1405,7 @@ msgstr ""
 "                              Java\n"
 
 #: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:529
+#: src/msgmerge.c:532
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1438,21 +1445,21 @@ msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:325
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:336
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "keine Eingabedateien angegeben"
 
-#: src/msgcmp.c:183 src/msgmerge.c:341
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "es werden genau zwei Eingabedateien benötigt"
 
-#: src/msgcmp.c:202 src/msgmerge.c:450
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Aufruf: %s [OPTION] Def.po Ref.pot\n"
@@ -1487,12 +1494,12 @@ msgstr "  Def.po                        Übersetzungen\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  Ref.pot                       Referenzen auf die Quelldateien\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:516
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Optionen, die Verarbeitungen modifizieren:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:518
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1520,17 +1527,17 @@ msgstr "diese Meldung ist unübersetzt"
 msgid "this message needs to be reviewed by the translator"
 msgstr "diese Meldung muss vom Übersetzer geprüft werden"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1220
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "diese Meldung kommt vor, ist aber nicht definiert..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1223
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...diese Definition ist ähnlich"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1251
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert"
@@ -1583,7 +1590,7 @@ msgstr ""
 "  ->, --more-than=ANZAHL     Meldungen mit mehr als ANZAHL Definitionen\n"
 "                               anzeigen (Vorgabe: 1)\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:867
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1609,13 +1616,13 @@ msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "Die Vorgabe für die Kodierung ist die Kodierung der aktuellen Lokale.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:541
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                  Ausgabe eingerückt darstellen\n"
 
 #: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:543
+#: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
@@ -1623,7 +1630,7 @@ msgstr ""
 "schreiben\n"
 
 #: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:545
+#: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1632,14 +1639,14 @@ msgstr ""
 "                                  (Vorgabe)\n"
 
 #: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:547
+#: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                  .po-Datei streng nach Uniforum-Format "
 "erstellen\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:552
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "Eingabedatei fehlt"
@@ -1833,18 +1840,18 @@ msgstr "Lesen vorm Subprozeß %s fehlgeschlagen"
 msgid "%s subprocess terminated with exit code %d"
 msgstr "Subprozeß %s wurde mit dem Exitcode %d beendet"
 
-#: src/msgfmt.c:303
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "das Argument für %s sollte ein einfaches Punktzeichen sein"
 
-#: src/msgfmt.c:350
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ungültiger Endian-Wert: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:514
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1901,7 +1908,7 @@ msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Binären Katalog mit Meldungen aus der textuellen Übersetzung erstellen.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:743
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1915,7 +1922,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  Datei.po ...                Eingabedateien\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:482 src/msgunfmt.c:426 src/xgettext.c:791
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Art der Verarbeitung:\n"
@@ -1972,7 +1979,7 @@ msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict             Datei streng nach Uniforum-Format erstellen\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:767
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -2071,7 +2078,7 @@ msgstr ""
 "Die Optionen »-l« und »-d« sind notwendig.  Die .msg-Datei wird in das\n"
 "angegebene Verzeichnis geschrieben.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:783
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Überprüfung der Eingebedatei:\n"
@@ -2162,7 +2169,7 @@ msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics             Statistik zu den Übersetzungen anzeigen\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:569 src/msgunfmt.c:515
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
@@ -2222,13 +2229,13 @@ msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
 
-#: src/msggrep.c:256 src/po-lex.c:658 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:141
-#: src/x-c.c:416 src/x-csharp.c:160 src/x-elisp.c:147 src/x-glade.c:452
-#: src/x-java.c:173 src/x-librep.c:149 src/x-lisp.c:214 src/x-perl.c:228
-#: src/x-perl.c:303 src/x-perl.c:396 src/x-php.c:164 src/x-python.c:176
-#: src/x-rst.c:235 src/x-scheme.c:173 src/x-sh.c:157 src/x-smalltalk.c:93
-#: src/x-tcl.c:152 src/x-ycp.c:93
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
@@ -2355,7 +2362,7 @@ msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file        Ausgabe gemäß Vorkommen in Dateien erstellen\n"
 
-#: src/msginit.c:286
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2366,7 +2373,7 @@ msgstr ""
 "beschrieben.  Dies ist notwendig, damit Sie Ihre Übersetzungen testen "
 "können.\n"
 
-#: src/msginit.c:310
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2377,12 +2384,12 @@ msgstr ""
 "Bitte legen Sie die Lokale mit der Option »--locale« oder\n"
 "die .po-Datei für die Ausgabe mit der Option »--output-file« fest.\n"
 
-#: src/msginit.c:336
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s wurde erstellt.\n"
 
-#: src/msginit.c:356
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2391,12 +2398,12 @@ msgstr ""
 "Neue PO-Datei erstellen und die Meta-Informationen mit Werten der Umgebung des\n"
 "Benutzers initialisieren.\n"
 
-#: src/msginit.c:366
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=EINGABEDATEI    POT-Eingabedatei\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2408,13 +2415,13 @@ msgstr ""
 "POT-Datei gesucht.  Wenn die Eingabedatei »-« ist, wird die Standardeingabe\n"
 "gelesen.\n"
 
-#: src/msginit.c:374
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2425,19 +2432,19 @@ msgstr ""
 "Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben "
 "ist.\n"
 
-#: src/msginit.c:389
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          Lokale für die Ausgabe setzen\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         automatische Erstellung der PO-Datei annehmen\n"
 
-#: src/msginit.c:451
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2445,12 +2452,12 @@ msgstr ""
 "Mehr als eine .pot-Datei gefunden.\n"
 "Bitte geben Sie die .pot-Datei für die Eingabe mit der Option »--input« an.\n"
 
-#: src/msginit.c:459 src/msginit.c:464
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "Fehler beim Lesen des aktuellen Verzeichnisses"
 
-#: src/msginit.c:472
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2458,14 +2465,14 @@ msgstr ""
 "Keine .pot-Datei im aktuellen Verzeichnis gefunden.\n"
 "Bitte geben Sie die .pot-Datei für die Eingabe mit der Option »--input« an.\n"
 
-#: src/msginit.c:861 src/msginit.c:929 src/msginit.c:1089 src/msginit.c:1168
-#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
-#: src/read-tcl.c:127 src/write-resources.c:104
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "Subprozeß %s mit dem Exitcode %d fehlgeschlagen"
 
-#: src/msginit.c:1054
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2482,29 +2489,29 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1443
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "German messages for %s"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "der Zeichensatz »%s« bezeichnet keine portable Kodierung"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "zwei unterschiedliche Zeichensätze »%s« und »%s« in Eingabedatei"
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "bei Eingabedatei »%s« fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
-#: src/msgl-cat.c:207
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2513,19 +2520,19 @@ msgstr ""
 "bei Bereich »%s« der Eingabedatei »%s« fehlt Kopfeintrag mit der Angabe des\n"
 "Zeichensatzes"
 
-#: src/msgl-cat.c:389 src/msgl-iconv.c:361
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "Zeichensatz »%s« für die Ausgabe bezeichnet keine portable Kodierung"
 
-#: src/msgl-cat.c:440 src/msgl-cat.c:446 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:2770
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "Warnung: "
 
-#: src/msgl-cat.c:441
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2534,7 +2541,7 @@ msgstr ""
 "Eingabedateien enthalten Meldungen in unterschiedlichen Kodierungen (u. a.\n"
 "UTF-8).  Die Ausgabe wird nach UTF-8 konvertiert.\n"
 
-#: src/msgl-cat.c:447
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2548,7 +2555,7 @@ msgstr ""
 "bitte\n"
 "die Option --to-code.\n"
 
-#: src/msgl-cat.c:486
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2562,7 +2569,7 @@ msgstr ""
 "Sie sicher, daß sie von vornherein UTF-8-kodiert sind; ändern Sie dazu die\n"
 "Quellcodedateien.\n"
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2575,12 +2582,12 @@ msgstr ""
 "Ausgabe von '%s' könnte nicht korrekt sein.\n"
 "Mögliche Abhilfen:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "· LC_ALL auf eine Lokale mit der Kodierung »%s« setzen.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2591,7 +2598,7 @@ msgstr ""
 "  dann '%s' anwenden,\n"
 "  dann nach »%s« mittels 'msgconv' zurück konvertieren.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2604,7 +2611,7 @@ msgstr ""
 "  dann '%s' anwenden,\n"
 "  dann nach »%s« mittels 'msgconv' zurück konvertieren.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2615,24 +2622,24 @@ msgstr ""
 "Ausgabe von '%s' könnte nicht korrekt sein.\n"
 "Eine mögliche Abhilfe ist, LC_ALL=C zu setzen.\n"
 
-#: src/msgl-check.c:91
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "Pluralausdruck kann negative Werte ergeben"
 
-#: src/msgl-check.c:101
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu, aber Pluralausdruck kann Werte so groß wie %lu ergeben"
 
-#: src/msgl-check.c:142
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "Pluralausdruck kann Teilung durch Null ergeben"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "Pluralausdruck kann einen Ganzzahl-Überlauf ergeben"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2641,51 +2648,51 @@ msgstr ""
 "Teilung\n"
 "durch Null"
 
-#: src/msgl-check.c:184
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Bitte das Folgende versuchen; gültig für %s:"
 
-#: src/msgl-check.c:267 src/msgl-check.c:291
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf"
 
-#: src/msgl-check.c:269
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "aber dem Kopfeintrag fehlt das Attribut »plural=AUSDRUCK«"
 
-#: src/msgl-check.c:293
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "aber dem Kopfeintrag fehlt das Attribut »nplurals=GANZZAHL«"
 
-#: src/msgl-check.c:329
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "ungültige Pluralwerte"
 
-#: src/msgl-check.c:351
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "ungültiger Pluralausdruck"
 
-#: src/msgl-check.c:381 src/msgl-check.c:397
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:383
+#: src/msgl-check.c:392
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "aber einige Meldungen haben nur eine Pluralform"
 msgstr[1] "aber einige Meldungen haben nur %lu Pluralformen"
 
-#: src/msgl-check.c:399
+#: src/msgl-check.c:408
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "aber einige Meldungen haben eine Pluralform"
 msgstr[1] "aber einige Meldungen haben %lu Pluralformen"
 
-#: src/msgl-check.c:419
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2694,86 +2701,86 @@ msgstr ""
 "Kopfeintrag fehlt die Zeile:\n"
 "»Plural-Forms: nplurals=GANZZAHL; plural=AUSDRUCK;«"
 
-#: src/msgl-check.c:501
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr_plural«-Eintrag beginnen nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:509
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr[%u]«-Eintrag beginnen nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:524
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr«-Eintrag beginnen nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:542
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr_plural«-Eintrag enden nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:550
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr[%u]«-Eintrag enden nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:565
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr«-Eintrag enden nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:577
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "Die Plural-Behandlung ist eine Erweiterung von GNU gettext"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Accelerator"
 
-#: src/msgl-check.c:629
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 "»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Accelerator auf"
 
-#: src/msgl-check.c:669
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
 
-#: src/msgl-check.c:677
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "Feld »%s« im Kopfeintrag sollte am Beginn der Zeile anfangen\n"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "Einige Felder im Kopfeintrag haben immer noch den anfänglichen Vorgabewert\n"
 
-#: src/msgl-check.c:704
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "Feld »%s« hat immer noch den anfänglichen Vorgabewert\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: Eingabe ist nicht gültig in der Kodierung »%s«"
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: Fehler beim Konvertieren von der Kodierung »%s« nach der\n"
 "Kodierung »%s«"
 
-#: src/msgl-iconv.c:269
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "bei der Eingabedatei fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
-#: src/msgl-iconv.c:291 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:618 src/xgettext.c:610
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2782,7 +2789,7 @@ msgstr ""
 "Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n"
 "%s hängt von iconv() ab, und iconv() unterstützt diese Konvertierung nicht."
 
-#: src/msgl-iconv.c:321
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2791,8 +2798,8 @@ msgstr ""
 "Konvertierung »%s« nach »%s« führt zu doppelten Einträgen: unterschiedliche "
 "msgids werden gleich."
 
-#: src/msgl-iconv.c:327 src/recode-sr-latin.c:301 src/x-python.c:625
-#: src/xgettext.c:617
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2801,16 +2808,16 @@ msgstr ""
 "Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n"
 "%s hängt von iconv() ab.  Diese Version wurde ohne iconv() erstellt."
 
-#: src/msgmerge.c:358 src/msgmerge.c:364
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s ist nur mit %s gültig"
 
-#: src/msgmerge.c:418
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr "Art der Sicherung"
 
-#: src/msgmerge.c:455
+#: src/msgmerge.c:458
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2834,19 +2841,19 @@ msgstr ""
 "exakte Übereinstimmung bei Meldungen gibt, wird mittels nicht-exakter Suche\n"
 "versucht, ein besseres Ergebnis zu erzielen.\n"
 
-#: src/msgmerge.c:472
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  Def.po                   Übersetzungen, die sich auf die alten Quellen\n"
 "                             beziehen\n"
 
-#: src/msgmerge.c:474
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  Ref.pot                  Referenzen aus den neuen Quellen\n"
 
-#: src/msgmerge.c:478
+#: src/msgmerge.c:481
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2855,7 +2862,7 @@ msgstr ""
 "  -C, --compendium=DATEI   zusätzliche Bibliothek mit Übersetzungen, es\n"
 "                             können mehrere angegeben werden\n"
 
-#: src/msgmerge.c:484
+#: src/msgmerge.c:487
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2864,30 +2871,30 @@ msgstr ""
 "  -U, --update                Def.po aktualisieren; nichts unternehmen,\n"
 "                                wenn Def.po bereits aktuell ist\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Angaben zu Ausgabedateien beim Aktualisieren (Update):\n"
 
-#: src/msgmerge.c:498
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Das Ergebnis wird nach Def.po zurückgeschrieben.\n"
 
-#: src/msgmerge.c:500
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 "      --backup=KONTROLLE      Eine Sicherungskopie von Def.po anlegen\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=SUFFIX         Das übliche Suffix der Sicherungskopie\n"
 "                                überschreiben\n"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:507
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2909,7 +2916,7 @@ msgstr ""
 "                    andernfalls einfache.\n"
 "  simple, never   immer einfache Sicherungskopien erstellen\n"
 
-#: src/msgmerge.c:511
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2919,12 +2926,12 @@ msgstr ""
 "Das Suffix für Sicherungskopien ist ~, außer wenn --suffix oder die\n"
 "Umgebungsvariable SIMPLE_BACKUP_SUFFIX gesetzt ist.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:523
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     fuzzy-Übereinstimmung nicht verwenden\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:525
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2933,22 +2940,22 @@ msgstr ""
 "Meldungen\n"
 "                             beibehalten\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       Fortschrittsanzeige unterdrücken\n"
 
-#: src/msgmerge.c:1324
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "diese Meldung sollte Pluralformen definieren"
 
-#: src/msgmerge.c:1347
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "diese Meldung sollte keine Pluralformen definieren"
 
-#: src/msgmerge.c:1685
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2957,7 +2964,7 @@ msgstr ""
 "%s%ld alte + %ld Referenzeinträge gelesen,\n"
 "%ld stimmen überein, %ld ungenau, %ld fehlen, %ld veraltet.\n"
 
-#: src/msgmerge.c:1693
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " fertig.\n"
 
@@ -3112,12 +3119,12 @@ msgstr ""
 "doppelte\n"
 "                                   verwerfen\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -3127,7 +3134,7 @@ msgstr ""
 "Konvertierung der Meldungen in den Zeichensatz des Anwenders\n"
 "könnte fehlschlagen.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3136,7 +3143,7 @@ msgstr ""
 "Zeichensatz »%s« wird nicht unterstützt.  %s hängt von iconv() ab,\n"
 "und iconv() unterstützt »%s« nicht.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3144,15 +3151,15 @@ msgstr ""
 "Dieses Problem lässt sich beheben, wenn Sie GNU libiconv installieren\n"
 "und dann GNU gettext erneut installieren.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Gleichwohl Fortsetzung; Parsing-Fehler sind zu erwarten."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Gleichwohl Fortsetzung."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3161,7 +3168,7 @@ msgstr ""
 "Zeichensatz »%s« wird nicht unterstützt.  %s hängt von iconv() ab.\n"
 "Diese Version wurde ohne iconv() erstellt.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3170,32 +3177,32 @@ msgstr ""
 "Konvertierung der Meldungen in den Zeichensatz des Anwenders\n"
 "wird fehlschlagen.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "Nicht konsistente Verwendung von #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "»msgstr[]«-Abschnitt fehlt"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "»msgstr[]«-Abschnitt fehlt"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "»msgstr«-Abschnitt fehlt"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "erste Pluralform hat einen Index ungleich Null"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "Pluralform hat einen falschen Index"
@@ -3205,7 +3212,7 @@ msgstr "Pluralform hat einen falschen Index"
 msgid "too many errors, aborting"
 msgstr "zu viele Fehler: Abbruch"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:708 src/write-po.c:833
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ungültige Multibyte-Sequenz"
@@ -3249,60 +3256,60 @@ msgstr "Zeilenende innerhalb einer Zeichenkette"
 msgid "context separator  within string"
 msgstr "Kontext-Trenner  innerhalb einer Zeichenkette"
 
-#: src/read-catalog.c:328 src/xgettext.c:903
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "diese Datei darf keine »domain«-Anweisung enthalten"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "Mehrfachdefinition der Meldung"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "dies ist die Stelle der ersten Definition"
 
-#: src/read-mo.c:106 src/read-mo.c:127 src/read-mo.c:173 src/read-mo.c:200
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "Datei »%s« ist verstümmelt"
 
-#: src/read-mo.c:130
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "Datei »%s« hat eine nicht mit NUL terminierte Zeichenkette"
 
-#: src/read-mo.c:166 src/read-mo.c:275
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "Datei »%s« ist nicht im GNU .mo-Format"
 
-#: src/read-mo.c:179
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "Datei »%s« hat bei %s eine nicht mit NUL terminierte Zeichenkette"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "Warnung: ungültige \\uxxxx-Syntax für ein Unicode-Zeichen"
 
-#: src/read-stringtable.c:803
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "Warnung: Zeichenkette nicht terminiert"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "Warnung: Syntaxfehler"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "Warnung: nicht terminiertes Schlüssel/Wert-Paar"
 
-#: src/read-stringtable.c:940
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr "Warnung: Syntaxfehler, ';' nach der Zeichenkette erwartet"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "Warnung: Syntaxfehler, '=' or ';' nach der Zeichenkette erwartet"
 
@@ -3367,7 +3374,7 @@ msgstr ""
 msgid "error writing stdout"
 msgstr "Fehler beim Schreiben von Standardausgabe"
 
-#: src/write-catalog.c:127
+#: src/write-catalog.c:126
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3377,7 +3384,7 @@ msgstr ""
 "properties«-Syntax von Java auszugeben. Versuchen Sie als Ersatz auf die PO-"
 "Dateien- Syntax auszuweichen."
 
-#: src/write-catalog.c:130
+#: src/write-catalog.c:129
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3386,7 +3393,7 @@ msgstr ""
 "Es ist nicht möglich, mehrere Übersetzungsbereiche in eine Datei mit der »."
 "strings«-Syntax von Nextstep/Gnustep auszugeben."
 
-#: src/write-catalog.c:163
+#: src/write-catalog.c:162
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
@@ -3395,7 +3402,7 @@ msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber das "
 "Ausgabeformat unterstützt keine Pluralbehandlung."
 
-#: src/write-catalog.c:198
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3405,7 +3412,7 @@ msgstr ""
 "das Ausgabeformat unterstützt solche nicht.  Versuchen Sie, eine Java-Klasse "
 "mit »msgfmt --java« zu erstellen und keine »properties«-Datei."
 
-#: src/write-catalog.c:203
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3413,68 +3420,64 @@ msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber das "
 "Ausgabeformat unterstützt keine Pluralbehandlung."
 
-#: src/write-catalog.c:230 src/write-catalog.c:274
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "Ausgabedatei »%s« kann nicht erstellt werden"
 
-#: src/write-catalog.c:238 src/write-catalog.c:282
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "Standardausgabe"
 
-#: src/write-csharp.c:611
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"Katalog mit Meldungen weist kontext-abhängige Übersetzungen auf, aber das\n"
-".dll Format von C# unterstützt keine Kontextangaben.\n"
-
-#: src/write-csharp.c:678
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "Fehler beim Anlegen von Verzeichnis »%s«"
 
-#: src/write-csharp.c:740
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "Kompilierung der C#-Klasse ist fehlgeschlagen; bitte versuchen Sie --verbose"
 
-#: src/write-java.c:912
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
 msgstr ""
-"Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber das\n"
-".resources-Format von C# unterstützt keine Pluralbehandlung.\n"
+"Kompilierung der C#-Klasse ist fehlgeschlagen; bitte versuchen Sie --verbose"
 
-#: src/write-java.c:937
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "kein gültiger Name einer Java-Klasse: %s"
 
-#: src/write-java.c:1021
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Kompilierung der Java-Klasse ist fehlgeschlagen; bitte versuchen Sie\n"
 "--verbose oder setzen Sie $JAVAC"
 
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"Kompilierung der Java-Klasse ist fehlgeschlagen; bitte versuchen Sie\n"
+"--verbose oder setzen Sie $JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "Fehler beim Öffnen von  »%s« zum Schreiben"
 
-#: src/write-po.c:767
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "Zu übersetzende Meldungen sollten nicht die Escape-Sequenz »\\%c« enthalten"
 
-#: src/write-po.c:1213 src/write-po.c:1342
+#: src/write-po.c:1212 src/write-po.c:1341
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3489,7 +3492,7 @@ msgstr ""
 "ausweichen, die nur aus ASCII-kodierten Zeichen besteht.\n"
 "%s\n"
 
-#: src/write-po.c:1225 src/write-po.c:1354
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3504,7 +3507,7 @@ msgstr ""
 "ausweichen, die nur aus ASCII-kodierten Zeichen besteht.\n"
 "%s\n"
 
-#: src/write-qt.c:668
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3512,7 +3515,7 @@ msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber der\n"
 "Qt-Katalog mit den Meldungen unterstützt keine Pluralbehandlung.\n"
 
-#: src/write-qt.c:694
+#: src/write-qt.c:693
 #, fuzzy
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
@@ -3527,7 +3530,7 @@ msgstr ""
 "Unicode nur in übersetzten Zeichenketten, nicht in unübersetzten "
 "Zeichenketten\n"
 
-#: src/write-qt.c:718
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3540,12 +3543,12 @@ msgstr ""
 "Unicode nur in übersetzten Zeichenketten, nicht in unübersetzten "
 "Zeichenketten\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "Fehler beim Schreiben zum Subprozeß %s"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3554,7 +3557,7 @@ msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber das\n"
 ".resources-Format von C# unterstützt keine Pluralbehandlung.\n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3562,7 +3565,7 @@ msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber das\n"
 ".resources-Format von C# unterstützt keine Pluralbehandlung.\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3571,7 +3574,7 @@ msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber der\n"
 "Tcl-Katalog mit den Meldungen unterstützt keine Pluralbehandlung\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3579,27 +3582,27 @@ msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber der\n"
 "Tcl-Katalog mit den Meldungen unterstützt keine Pluralbehandlung\n"
 
-#: src/x-awk.c:343 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-awk.c:594
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: Warnung: regulärer Ausdruck nicht korrekt terminiert"
 
-#: src/x-c.c:1155 src/x-csharp.c:1502 src/x-java.c:860
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt terminiert"
 
-#: src/x-c.c:1179
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-csharp.c:217 src/xgettext.c:1845
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3608,7 +3611,7 @@ msgstr ""
 "Zeichenkette bei %s%s ist nicht ASCII-kodiert.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:264
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3617,7 +3620,7 @@ msgstr ""
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:280
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3626,7 +3629,7 @@ msgstr ""
 "%s:%d: Lange unvollständige Multibyte-Sequenz.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:292
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3635,7 +3638,7 @@ msgstr ""
 "%s:%d: Unvollständige Multibyte-Sequenz am Ende der Datei.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:301
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3644,12 +3647,12 @@ msgstr ""
 "%s:%d: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:310 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: Fehler von iconv"
 
-#: src/x-csharp.c:333
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3658,33 +3661,33 @@ msgstr ""
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:1383 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: Warnung: ungültiges Unicode-Zeichen"
 
-#: src/x-csharp.c:1505 src/x-java.c:863
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: Warnung: nicht terminierte konstante Zeichenkette"
 
-#: src/x-csharp.c:2009 src/x-java.c:1357
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: Warnung: ')' gefunden, wo '}' erwartet wurde"
 
-#: src/x-csharp.c:2043 src/x-java.c:1391
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: Warnung: '}' gefunden, wo ')' erwartet wurde"
 
 # CHECKIT
-#: src/x-glade.c:459 src/x-glade.c:466
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:493
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3693,48 +3696,48 @@ msgstr ""
 "Die Sprache »glade« wird nicht unterstützt.  %s hängt von expat ab.\n"
 "Diese Version wurde ohne expat erstellt.\n"
 
-#: src/x-java.c:483
+#: src/x-java.c:492
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-perl.c:309
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: »%s« zum Terminieren der Zeichenkette ist vor EOF nicht vorhanden"
 
-#: src/x-perl.c:1035
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: rechte Klammer bei \\x{HEXZAHL} fehlt"
 
-#: src/x-perl.c:1155
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: ungültige Interpolation (»\\l«) bei dem 8-Bit-Zeichen »%c«"
 
-#: src/x-perl.c:1175
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: ungültige Interpolation (»\\u«) bei dem 8-Bit-Zeichen »%c«"
 
-#: src/x-perl.c:1209
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: ungültige Interpolation einer Variablen bei »%c«"
 
-#: src/x-perl.c:1222
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: ungültige Interpolation (»\\L«) bei dem 8-Bit-Zeichen »%c«"
 
-#: src/x-perl.c:1239
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ungültige Interpolation (»\\U«) bei dem 8-Bit-Zeichen »%c«"
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, fuzzy, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3744,7 +3747,7 @@ msgstr ""
 "Zeichenkette bei %s%s ist nicht ASCII-kodiert.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3754,7 +3757,7 @@ msgstr ""
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3764,7 +3767,7 @@ msgstr ""
 "%s:%d: Lange unvollständige Multibyte-Sequenz.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3774,7 +3777,7 @@ msgstr ""
 "%s:%d: Unvollständige Multibyte-Sequenz am Ende der Datei.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3784,7 +3787,7 @@ msgstr ""
 "%s:%d: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3794,27 +3797,27 @@ msgstr ""
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unbekannt Kodierung »%s«. Es wird stattdessen mit ASCII fortgefahren."
 
-#: src/x-rst.c:110
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ungültige Definition einer Zeichenkette"
 
-#: src/x-rst.c:174
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: Zahl nach # fehlt"
 
-#: src/x-rst.c:209
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ungültiger Ausdruck einer Zeichenkette"
 
-#: src/x-sh.c:1076
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3823,32 +3826,32 @@ msgstr ""
 "%s:%lu: Warnung: die Syntax $\"...\" ist aus Sicherheitsgründen als veraltet "
 "zu betrachten; verwenden Sie stattdessen use eval_gettext"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "»--join-existing« kann nicht benutzt werden, wenn nach Standardausgabe\n"
 "geschrieben wird"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 "ohne Angabe zu berücksichtigender Schlüsselwörter schlägt xgettext fehl"
 
-#: src/xgettext.c:687
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "Warnung: Typ der Datei »%s« mit Suffix »%s« ist unbekannt; C wird versucht"
 
-#: src/xgettext.c:738
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n"
 
-#: src/xgettext.c:761
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3856,25 +3859,25 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME  Ausgabe in NAME.po (anstatt in messages.po)\n"
 
-#: src/xgettext.c:763
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=DATEI         Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/xgettext.c:765
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=VERZ      Ausgabedateien in Verzeichnis VERZ ablegen\n"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Wahl der Sprache für die Eingabedatei:\n"
 
-#: src/xgettext.c:772
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3892,12 +3895,12 @@ msgstr ""
 "                                   PHP, GCC-source, NXStringTable, RST, "
 "Glade)\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      Abkürzung für --language=C++\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3907,7 +3910,7 @@ msgstr ""
 "Eingabedatei\n"
 "geraten.\n"
 
-#: src/xgettext.c:785
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3916,24 +3919,24 @@ msgstr ""
 "      --from-code=NAME           Kodierung der Eingebedateien\n"
 "                                   (außer für Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Die Vorgabe ist, dass für Eingabedateien ASCII angenommen wird.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing            Meldungen an existierende Datei anhängen\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=DATEI.po    Einträge aus DATEI.po nicht herausholen\n"
 
-#: src/xgettext.c:797
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3943,17 +3946,17 @@ msgstr ""
 "Zeilen\n"
 "                                   vor einem Schlüsselwort) herausschreiben\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Besondere Optionen bei »Language«:\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all          alle Zeichenketten extrahieren\n"
 
-#: src/xgettext.c:805 src/xgettext.c:812
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3966,7 +3969,7 @@ msgstr ""
 "                                 EmacsLisp, librep, Scheme, Java, C#, awk,\n"
 "                                 Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3976,7 +3979,7 @@ msgstr ""
 "                               wird (ohne WORT-Angabe wird nicht nach den\n"
 "                               vorgegebenen Schlüsselwörtern gesucht)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3988,7 +3991,7 @@ msgstr ""
 "                                der Argumentzahl ARG des Schlüsselworts "
 "WORT\n"
 
-#: src/xgettext.c:819
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4002,37 +4005,42 @@ msgstr ""
 "                                   librep, Scheme, Java, C#, awk, YCP, Tcl,\n"
 "                                   Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs            Trigraph-Zeichen von ANSI C bei der Eingabe\n"
 "                               erkennen\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                   (nur die Programmiersprachen C, C++,\n"
 "                                   ObjectiveC)\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                     Zeichenketten im Qt-Format erkennen\n"
 
-#: src/xgettext.c:829 src/xgettext.c:833
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                 (nur die Programmiersprache C++)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                     Zeichenketten im Qt-Format erkennen\n"
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 "      --boost                  Zeichenketten im Boost-Format erkennen\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4040,19 +4048,19 @@ msgstr ""
 "  --debug                    detaillierteres Ergebnis bei Erkennung der\n"
 "                               Formatelemente\n"
 
-#: src/xgettext.c:854
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     eine ».properties«-Datei von Java erstellen\n"
 
-#: src/xgettext.c:869
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=KETTE  Halter des Copyrights in Ausgabe setzen\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4060,14 +4068,25 @@ msgstr ""
 "      --foreign-user            keine Zeile mit FSF-Copyright in Ausgabe\n"
 "                                  einfügen\n"
 
-#: src/xgettext.c:873
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+"      --copyright-holder=KETTE  Halter des Copyrights in Ausgabe setzen\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADRESSE  Adresse für msgid-Fehler angeben\n"
 
-#: src/xgettext.c:875
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -4076,7 +4095,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=KETTE]   KETTE oder \"\" als Präfix für msgstr "
 "nehmen\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -4085,7 +4104,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=KETTE]   KETTE oder \"\" als Suffix für msgstr "
 "nehmen\n"
 
-#: src/xgettext.c:1642
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -4094,16 +4113,16 @@ msgstr ""
 "Ein --flag-Argument folgt nicht der ::[pass-]-Syntax: "
 "%s"
 
-#: src/xgettext.c:1741
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "Standardeingabe"
 
-#: src/xgettext.c:1921 src/xgettext.c:1954 src/xgettext.c:2012
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: Warnung: "
 
-#: src/xgettext.c:1924
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4112,7 +4131,7 @@ msgstr ""
 "Obwohl das Formatelement an der Position eines Formatelements verwendet "
 "wird, ist %s kein gültiges %s Formatelement. Der Grund: %s\n"
 
-#: src/xgettext.c:1925
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -4121,7 +4140,7 @@ msgstr ""
 "Obwohl es als Formatelement deklariert wurde, ist %s kein gültiges %s "
 "Formatelement. Der Grund: %s\n"
 
-#: src/xgettext.c:1956
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4135,7 +4154,7 @@ msgstr ""
 "Verwenden Sie besser ein Formatelement mit bezeichneten Argumenten\n"
 "und einem Mapping anstelle eines Tuples für die Argumente.\n"
 
-#: src/xgettext.c:2014
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4145,28 +4164,28 @@ msgstr ""
 "gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n"
 "zurück, keine leere Zeichenkette.\n"
 
-#: src/xgettext.c:2618
+#: src/xgettext.c:2664
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "mehrdeutiges Argument %s für %s"
 
-#: src/xgettext.c:2645
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "Warnung: fehlender Kontext für das Schlüsselwort »%.*s«"
 
-#: src/xgettext.c:2670
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "Warnung: fehlender Kontext für das Plural-Argument des Schlüsselwortes »%.*s«"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "Abweichung beim Kontext zwischen Singular- und Pluralform"
 
-#: src/xgettext.c:2771
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4178,7 +4197,7 @@ msgstr ""
 "Variable MSGID_BUGS_ADDRESS aus; falls nicht, geben Sie bitte die\n"
 "Option an der Befehlszeile mit --msgid-bugs-address an.\n"
 
-#: src/xgettext.c:2970
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "Programmiersprache »%s« unbekannt"
@@ -4187,6 +4206,38 @@ msgstr "Programmiersprache »%s« unbekannt"
 msgid ""
 msgstr ""
 
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Mehrfache Referenzen für %%%c."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright © %s Free Software Foundation, Inc.\n"
+#~ "Dies ist freie Software; in den Quellen befindet sich die "
+#~ "Lizenzbedingung.\n"
+#~ "Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
+#~ "die VERWENDBARKEIT ZU EINEN ANGEGEBENEN ZWECK.\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "Katalog mit Meldungen weist kontext-abhängige Übersetzungen auf, aber "
+#~ "das\n"
+#~ ".dll Format von C# unterstützt keine Kontextangaben.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber das\n"
+#~ ".resources-Format von C# unterstützt keine Pluralbehandlung.\n"
+
 #~ msgid "The %%J directive is only allowed at the beginning of the string."
 #~ msgstr ""
 #~ "Die Formatanweisung %%J ist nur am Beginn einer Zeichenkette erlaubt."
diff --git a/gettext-tools/po/el.po b/gettext-tools/po/el.po
index a4e160eea..57015b557 100644
--- a/gettext-tools/po/el.po
+++ b/gettext-tools/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 1998-05-17 13:12+0200\n"
 "Last-Translator: Simos KSenitellis \n"
 "Language-Team: Greek \n"
@@ -15,96 +15,97 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
 #
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "áäõíáìßá åðéóôñïöÞò óôï êáôÜëïãï \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "áäõíáìßá åðéóôñïöÞò óôï êáôÜëïãï \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "áäõíáìßá åðéóôñïöÞò óôï êáôÜëïãï \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
 #
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
 
 #
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ"
 
 #
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
 
 #
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
 
 #
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -114,133 +115,133 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "¶ãíùóôï óöÜëìá óõóôÞìáôïò"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
 #
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n"
 
 #
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `--%s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
 #
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `%c%s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
 #
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß ðáñÜìåôñï\n"
 
 #
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `--%s'\n"
 
 #
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `%c%s'\n"
 
 #
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ìç áðïäåêôÞ åðéëïãÞ -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ìç Ýãêõñç åðéëïãÞ -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ç åðéëïãÞ áðáéôåß ðáñÜìåôñï -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé äéöïñïýìåíç\n"
 
 #
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 #
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 #
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "H ìíÞìç åîáíôëÞèçêå"
 
 #
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
@@ -264,252 +265,259 @@ msgstr "
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
 #
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -517,7 +525,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -525,27 +533,27 @@ msgid ""
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -556,62 +564,62 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
 #
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr ""
 "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
 
 #
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -619,24 +627,24 @@ msgid ""
 msgstr ""
 
 #
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
 #
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -645,7 +653,7 @@ msgstr ""
 "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
 
 #
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -654,7 +662,7 @@ msgstr ""
 "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
 
 #
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -662,123 +670,121 @@ msgid ""
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-#
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"ÐíåõìáôéêÜ Äéêáéþìáôá (C) %s Free Software Foundation, Inc.\n"
-"Áõôü ôï ðñüãñáììá åßíáé åëåýèåñï ëïãéóìéêü· äåßôå ôï ðçãáßï êþäéêá ãéá ôïõò\n"
-"êáíïíéóìïýò áíôéãñáöÞò. Äåí õðÜñ÷åé ÊÁÌÉÁ ÅÃÃÕÇÓÇ· ïýôå áêüìá ãéá\n"
-"ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
 
 #
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
 #
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
 
 #
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -786,344 +792,349 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
 #
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 #, fuzzy
 msgid "Report bugs to .\n"
 msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
 #
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
 
 #
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
 #
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
 #
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1141,33 +1152,33 @@ msgstr ""
 "  -S, --strict             ìïñöÞ åîüäïõ ôï áõóôçñü Uniforum\n"
 "  -V, --version            åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
 #
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Ý÷åé åðéëå÷èåß áäýíáôï êñéôÞñéï åðéëïãÞò (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
 #
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1197,51 +1208,51 @@ msgstr ""
 "ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n"
 "èá äéáôçñçèïýí.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1249,42 +1260,56 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
 #
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "äåí êáèïñßóôçêáí áñ÷åßá åéóüäïõ"
 
 #
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
 #
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1310,88 +1335,88 @@ msgstr ""
 "Ý÷ïõí ìåôáöñáóôåß. Åêåß ðïõ äåí åíôïðßæåôáé áêñéâÞò áíôéóôoé÷ßá,\n"
 "ãßíåôáé åëáóôéêü ôáßñéáóìá ãéá êáëýôåñá áðïôåëÝóìáôá.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
 #
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "ðñïåéäïðïßçóç: áõôü ôï ìÞíõìá äåí ÷ñçóéìïðïåßôáé"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
 #
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé..."
 
 #
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...áëëÜ áõôüò ï ïñéóìüò åßíáé ðáñüìïéïò"
 
 #
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
 #
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "ðñïåéäïðïßçóç: áõôü ôï ìÞíõìá äåí ÷ñçóéìïðïåßôáé"
 
 #
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "âñÝèçêáí %d óïâáñÜ óöÜëìáôá"
 
 #
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá"
 
 #
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1420,76 +1445,76 @@ msgstr ""
 "ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n"
 "èá äéáôçñçèïýí.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 #
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
 #
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1498,23 +1523,23 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
 #
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "õðïëåßðïíôáé ïñßóìáôá"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1524,69 +1549,69 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
 #
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "õðïëåßðïíôáé ïñßóìáôá"
 
 #
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1594,210 +1619,210 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
 #
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, fuzzy, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d ìåôáöñáóìÝíá ìõíÞìáôá"
 
 #
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, fuzzy, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, fuzzy, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d ìç ìåôáöñáóìÝíá ìçíýìáôá"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1807,48 +1832,48 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1856,33 +1881,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1890,67 +1915,67 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ôï üíïìá ãéá ôç ðåñéï÷Þ \"%s\" äåí åßíáé êáôÜëëçëï ãéá üíïìá áñ÷åßïõ"
 
 #
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -1958,57 +1983,57 @@ msgstr ""
 "ãßíåé ÷ñÞóç ðñïèÝìáôïò"
 
 #
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "ç ïäçãßá `domain %s' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "ç êåíÞ åããñáöÞ `msgstr' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ç ðñïóåããéóôéêÞ åããñáöÞ `msgstr' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2048,30 +2073,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2079,24 +2104,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2104,54 +2129,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2163,54 +2188,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2219,7 +2244,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2228,7 +2253,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2237,12 +2262,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2250,7 +2275,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2259,7 +2284,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2267,66 +2292,66 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 #
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2334,123 +2359,123 @@ msgstr[0] "
 msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
 #
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 #
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 #
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "ôï ðåäßï `%s' Ý÷åé ðáñáëçöèåß áðü ôç êåöáëßäá"
 
 #
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "ôï ðåäßá êåöáëßäáò `%s' èá Ýðñåðå íá îåêéíÜ óôçí áñ÷Þ ôçò ãñáììÞò"
 
 #
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "ìåñéêÜ ðåäßá ôçò êåöáëßäáò Ý÷ïõí áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
 
 #
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "ôï ðåäßï `%s' Ý÷åé áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
 #
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2574,19 +2599,19 @@ msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
 #
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
 #
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
 #
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2596,62 +2621,62 @@ msgstr ""
 "Ý÷ïõí ðáñáëçöèåß %d, á÷ñçóéìïðïßçôá %d.\n"
 
 #
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " Ýãéíå.\n"
 
 #
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2660,41 +2685,41 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2707,25 +2732,25 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
 #
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, fuzzy, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2733,28 +2758,28 @@ msgid ""
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2762,7 +2787,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 #, fuzzy
 msgid ""
 "Charset missing in header.\n"
@@ -2770,174 +2795,174 @@ msgid ""
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr ""
 
 #
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, fuzzy, c-format
 msgid "missing `msgstr[]' section"
 msgstr "ëåßðåé åíüôçôá `msgstr'"
 
 #
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, fuzzy, c-format
 msgid "missing `msgid_plural' section"
 msgstr "ëåßðåé åíüôçôá `msgstr'"
 
 #
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "ëåßðåé åíüôçôá `msgstr'"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
 
 #
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "ðÜñá ðïëëÜ óöÜëìáôá, åãêáôáëåßðù"
 
 #
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, fuzzy, c-format
 msgid "invalid multibyte sequence"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
 #
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "Üãíùóôç åíôïëÞ \"%s\""
 
 #
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, fuzzy, c-format
 msgid "invalid control sequence"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "ôÝëïò áñ÷åßïõ (EOF) óôï áëöáñéèìçôéêü"
 
 #
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "ôÝñìá-ãñáììÞò (eol) óôï áëöáñéèìçôéêü"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
 #
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "áõôü ôï áñ÷åßï äåí ìðïñåß íá ðåñéÝ÷åé ïäçãßåò ãéá ôç ðåñéï÷Þ"
 
 #
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "åðáíáëáìâáíüìåíïò ïñéóìüò ìçíýìáôïò"
 
 #
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "áõôÞ åßíáé ç èÝóç ôïõ ðñþôïõ ïñéóìïý"
 
 #
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "ôï áñ÷åßï \"%s\" ìçäåíßóôçêå êáé èá ãñáöïýí äåäïìÝíá óå áõôü"
 
 #
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
 
 #
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
 
 #
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
 
 #
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
 
 #
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n"
@@ -2946,45 +2971,45 @@ msgstr "
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
 #
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
 
 #
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -2992,95 +3017,92 @@ msgid ""
 msgstr ""
 
 #
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
 #
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
 
 #
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "êáíïíéêÞ Ýîïäïò"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-
 #
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "áäõíáìßá áëëáãÞò óôï êáôÜëïãï \"%s\""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
 #
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ"
 
 #
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3088,7 +3110,7 @@ msgstr ""
 "ôá ìçíýìáôá ðñïò ìåôÜöñáóç äåí ðñÝðåé íá ðåñéÝ÷ïõí ôï ÷áñáêôÞñá äéáöõãÞò `\\%"
 "c'"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3097,7 +3119,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3106,13 +3128,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3120,7 +3142,7 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3128,100 +3150,100 @@ msgid ""
 msgstr ""
 
 #
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
 #
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
 
 #
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3229,76 +3251,82 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
 
 #
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
+#
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
 #
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: ìç Ýãêõñç åðéëïãÞ -- %c\n"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3306,7 +3334,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3314,7 +3342,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3322,7 +3350,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3330,7 +3358,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3338,7 +3366,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3346,28 +3374,28 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
 #
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3375,55 +3403,55 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "ôï --join-existing äå ìðïñåß íá ÷ñçóéìïðïéçèåß üôáí ç Ýîïäïò ãñÜöåôáé óôçí "
 "êáíïíéêÞ Ýîïäï"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
 #
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "ðñïåéäïðïßçóç: ôï áñ÷åßï `%s' ìå êáôÜëçîç `%s' åßíáé Üãíùóôï· èá äïêéìáóôåß C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 #
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3435,58 +3463,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3495,14 +3523,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3510,7 +3538,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3519,74 +3547,89 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3594,30 +3637,30 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "êáíïíéêÞ åßóïäïò"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3626,34 +3669,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3662,15 +3705,29 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "ç ãëþóóá `%s' åßíáé Üãíùóôç"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "ÐíåõìáôéêÜ Äéêáéþìáôá (C) %s Free Software Foundation, Inc.\n"
+#~ "Áõôü ôï ðñüãñáììá åßíáé åëåýèåñï ëïãéóìéêü· äåßôå ôï ðçãáßï êþäéêá ãéá "
+#~ "ôïõò\n"
+#~ "êáíïíéóìïýò áíôéãñáöÞò. Äåí õðÜñ÷åé ÊÁÌÉÁ ÅÃÃÕÇÓÇ· ïýôå áêüìá ãéá\n"
+#~ "ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
+
 #
 #~ msgid "...this is the location of the first definition"
 #~ msgstr "...áõôÞ åßíáé ç èÝóç ôïõ ðñþôïõ ïñéóìïý"
diff --git a/gettext-tools/po/en@boldquot.po b/gettext-tools/po/en@boldquot.po
index fc428116f..942784e63 100644
--- a/gettext-tools/po/en@boldquot.po
+++ b/gettext-tools/po/en@boldquot.po
@@ -1,7 +1,7 @@
 # English translations for gettext-tools package.
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext-tools package.
-# Automatically generated, 2006.
+# Automatically generated, 2007.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools\n"
+"Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
-"PO-Revision-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"PO-Revision-Date: 2007-11-02 03:23+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -41,87 +41,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "invalid argument %s for %s"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "ambiguous argument %s for %s"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Valid arguments are:"
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "cannot find a temporary directory, try setting $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "cannot create a temporary directory using template “%s”"
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "cannot remove temporary file %s"
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "cannot remove temporary directory %s"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "write error"
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error while opening “%s” for reading"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "cannot open backup file “%s” for writing"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "error reading “%s”"
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "error writing “%s”"
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "error after reading “%s”"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() failed"
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C# compiler not found, try installing pnet"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# virtual machine not found, try installing pnet"
@@ -130,119 +131,119 @@ msgstr "C# virtual machine not found, try installing pnet"
 msgid "Unknown system error"
 msgstr "Unknown system error"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s subprocess failed"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: option ‘%s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: option ‘--%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: option ‘%c%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: option ‘%s’ requires an argument\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unrecognized option ‘--%s’\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unrecognized option ‘%c%s’\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: illegal option -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: invalid option -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: option requires an argument -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: option ‘-W %s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "invalid source_version argument to compile_java_class"
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "invalid target_version argument to compile_java_class"
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s”"
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java compiler not found, try installing gcj or set $JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Java virtual machine not found, try installing gij or set $JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s subprocess I/O error"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "cannot create pipe"
@@ -266,44 +267,44 @@ msgstr "cannot create pipe"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandle failed with error code 0x%08x"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle failed"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s subprocess"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subprocess got fatal signal %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr "‘%s’ is not a valid %s format string, unlike 'msgid'. Reason: %s"
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
@@ -311,18 +312,18 @@ msgstr ""
 "a format specification for argument %u, as in '%s', doesn't exist in "
 "‘msgid’"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "a format specification for argument %u doesn't exist in ‘%s’"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
@@ -330,12 +331,12 @@ msgstr ""
 "format specifications in ‘msgid’ and ‘%s’ for argument %u are "
 "not the same"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "The directive number %u starts with | but does not end with |."
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -345,44 +346,44 @@ msgstr ""
 "format specifier macro. The valid macro names are listed in ISO C 99 section "
 "7.8.1."
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "In the directive number %u, the token after ‘<’ is not followed by '>'."
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "The string refers to argument number %u but ignores argument number %u."
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "number of format specifications in ‘msgid’ and ‘%s’ does not "
 "match"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 "In the directive number %u, ‘{’ is not followed by an argument number."
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "In the directive number %u, ‘,’ is not followed by a number."
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 "The string ends in the middle of a directive: found ‘{’ without "
 "matching '}'."
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
@@ -390,12 +391,12 @@ msgstr ""
 "The directive number %u ends with an invalid character ‘%c’ instead of "
 "'}'."
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "The directive number %u ends with an invalid character instead of '}'."
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
@@ -403,22 +404,22 @@ msgstr ""
 "The string starts in the middle of a directive: found ‘}’ without "
 "matching '{'."
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "The string contains a lone ‘}’ after directive number %u."
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "In the directive number %u, the flags combination is invalid."
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "In the directive number %u, a precision is not allowed before '%c'."
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -427,31 +428,40 @@ msgstr ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "In the directive number %u, the precision specification is invalid."
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "In the directive number %u, flags are not allowed before '%c'."
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "‘msgid’ uses %%m but ‘%s’ doesn't"
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "‘msgid’ does not use %%m but ‘%s’ uses %%m"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "The string ends in the middle of a directive."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -459,14 +469,14 @@ msgstr ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
@@ -475,7 +485,7 @@ msgstr ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
@@ -484,7 +494,7 @@ msgstr ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
@@ -493,7 +503,7 @@ msgstr ""
 "In the directive number %u, the character ‘%c’ is not a valid "
 "conversion specifier."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -502,12 +512,12 @@ msgstr ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "The string refers to argument number %u in incompatible ways."
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -516,12 +526,12 @@ msgstr ""
 "In the directive number %u, the substring “%s” is not a valid date/"
 "time style."
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "In the directive number %u, “%s” is not followed by a comma."
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
@@ -529,7 +539,7 @@ msgstr ""
 "In the directive number %u, the substring “%s” is not a valid number "
 "style."
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -538,12 +548,12 @@ msgstr ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of “%s”, “%s”, “%s”, “%s”."
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "In the directive number %u, a choice contains no number."
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -552,7 +562,7 @@ msgstr ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', ‘#’ or '%s'."
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -561,12 +571,12 @@ msgstr ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "‘msgid’"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "a format specification for argument {%u} doesn't exist in ‘%s’"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -574,8 +584,8 @@ msgstr ""
 "format specifications in ‘msgid’ and ‘%s’ for argument {%u} are "
 "not the same"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -584,7 +594,7 @@ msgstr ""
 "In the directive number %u, parameter %u is of type ‘%s’ but a "
 "parameter of type ‘%s’ is expected."
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -599,33 +609,33 @@ msgstr[1] ""
 "In the directive number %u, too many parameters are given; expected at most %"
 "u parameters."
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "In the directive number %u, ‘%c’ is not followed by a digit."
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "In the directive number %u, the argument %d is negative."
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "The string ends in the middle of a ~/.../ directive."
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Found ‘~%c’ without matching '~%c'."
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "In the directive number %u, both the @ and the : modifiers are given."
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -634,29 +644,29 @@ msgstr ""
 "In the directive number %u, ‘~:[’ is not followed by two clauses, "
 "separated by '~;'."
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "In the directive number %u, ‘~;’ is used in an invalid position."
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "The string refers to some argument in incompatible ways."
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr ""
 "format specifications in ‘msgid’ and ‘%s’ are not equivalent"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr ""
 "format specifications in ‘%s’ are not a subset of those in ‘msgid"
 "[0m’"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -665,13 +675,13 @@ msgstr ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
 "a format specification for argument ‘%s’ doesn't exist in ‘%s’"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -679,13 +689,13 @@ msgstr ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "The string refers to the argument named ‘%s’ in incompatible ways."
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -694,7 +704,7 @@ msgstr ""
 "format specifications in ‘msgid’ expect a mapping, those in ‘%s’ "
 "expect a tuple"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -703,7 +713,7 @@ msgstr ""
 "format specifications in ‘msgid’ expect a tuple, those in ‘%s’ "
 "expect a mapping"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -712,7 +722,7 @@ msgstr ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "‘msgid’"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
@@ -720,16 +730,20 @@ msgstr ""
 "format specifications in ‘msgid’ and ‘%s’ for argument ‘%s"
 "[0m’ are not the same"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
+"‘msgid’ is a simple format string, but ‘%s’ is not: it contains "
+"an ‘L’ flag or a double-digit argument number"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "The string refers to a shell variable with a non-ASCII name."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -737,7 +751,7 @@ msgstr ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
@@ -745,11 +759,11 @@ msgstr ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "The string refers to a shell variable with an empty name."
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
@@ -758,7 +772,7 @@ msgstr ""
 "In the directive number %u, the character ‘%c’ is not a digit between "
 "1 and 9."
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
@@ -767,73 +781,75 @@ msgstr ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "too many arguments"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage: %s [OPTION]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Print the machine's hostname.\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Output format:\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 short host name\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -844,74 +860,79 @@ msgstr ""
 "domain\n"
 "                                name, and aliases\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            addresses for the hostname\n"
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative output:\n"
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  display this help and exit\n"
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               output version information and exit\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "Report bugs to .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "could not get host name"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "at most one input file allowed"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -920,63 +941,63 @@ msgstr ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "Input file location:\n"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   input PO file\n"
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "If no input file is given or if it is -, standard input is read.\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "Output file location:\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      write output to specified file\n"
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -985,71 +1006,71 @@ msgstr ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr "Message selection:\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            keep translated, remove untranslated messages\n"
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              remove ‘fuzzy’ marked messages\n"
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            keep ‘fuzzy’ marked messages\n"
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           remove obsolete #~ messages\n"
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         keep obsolete #~ messages\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribute manipulation:\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             set all messages ‘fuzzy’\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          set all messages obsolete\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        set all messages non-obsolete\n"
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1058,50 +1079,50 @@ msgstr ""
 "      --clear-previous        remove the “previous msgid” from all "
 "messages\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Input file syntax:\n"
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1110,55 +1131,55 @@ msgstr ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "Output details:\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              write PO file even if empty\n"
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                write the .po file using indented style\n"
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           do not write ‘#: filename:line’ lines\n"
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1166,40 +1187,40 @@ msgstr ""
 "  -n, --add-location          generate ‘#: filename:line’ lines "
 "(default)\n"
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     write out a Java .properties file\n"
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          set output page width\n"
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1208,31 +1229,31 @@ msgstr ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generate sorted output\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sort output by file location\n"
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1255,23 +1276,23 @@ msgstr ""
 "is specified, they will be taken from the first PO file to define them.\n"
 "File positions from all PO files will be cumulated.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               input files\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       get list of input files from FILE\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "If input file is -, standard input is read.\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1280,7 +1301,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1289,7 +1310,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1298,7 +1319,7 @@ msgstr ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
@@ -1306,7 +1327,7 @@ msgid ""
 msgstr ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1316,12 +1337,12 @@ msgstr ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          encoding for output\n"
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1330,27 +1351,46 @@ msgstr ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=STYLEFILE       specify CSS style rule file for --color\n"
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "no input files given"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "exactly 2 input files required"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Usage: %s [OPTION] def.po ref.pot\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1367,22 +1407,22 @@ msgstr ""
 "you have translated each and every message in your program.  Where an exact\n"
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      translations\n"
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     references to the sources\n"
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operation modifiers:\n"
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1391,59 +1431,59 @@ msgstr ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             consider fuzzy entries\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      consider untranslated entries\n"
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, c-format
 msgid "this message is untranslated"
 msgstr "this message is untranslated"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "this message needs to be reviewed by the translator"
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "this message is used but not defined..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...but this definition is similar"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "this message is used but not defined in %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "warning: this message is not used"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "found %d fatal error"
 msgstr[1] "found %d fatal errors"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "at least two files must be specified"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1464,7 +1504,7 @@ msgstr ""
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1473,7 +1513,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1481,34 +1521,34 @@ msgstr ""
 "      --omit-header           don't write header with ‘msgid \"\"’ "
 "entry\n"
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converts a translation catalog to a different character encoding.\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Conversion target:\n"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "The default encoding is the current locale's encoding.\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indented output style\n"
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           suppress ‘#: filename:line’ lines\n"
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
@@ -1517,28 +1557,28 @@ msgstr ""
 "      --add-location          preserve ‘#: filename:line’ lines "
 "(default)\n"
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strict Uniforum output style\n"
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "no input file given"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr "exactly one input file required"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Usage: %s [OPTION] INPUTFILE\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1551,22 +1591,22 @@ msgstr ""
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   input PO or POT file\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr "missing command name"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1581,7 +1621,7 @@ msgstr ""
 "msgexec's output.  msgexec's return code is the maximum return code\n"
 "across all invocations.\n"
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1590,42 +1630,42 @@ msgstr ""
 "A special builtin command called ‘0’ outputs the translation, followed by a\n"
 "null byte.  The output of “msgexec 0” is suitable as input for “xargs -0”.\n"
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       input PO file\n"
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr "write to stdout failed"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "write to %s subprocess failed"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr "missing filter name"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "at least one sed script must be specified"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Applies a filter to all translations of a translation catalog.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1634,19 +1674,19 @@ msgstr ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1657,126 +1697,126 @@ msgstr ""
 "commands\n"
 "                                to be executed\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             do not use C escapes in output (default)\n"
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indented output style\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr "Not yet implemented."
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "cannot set up nonblocking I/O to %s subprocess"
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "communication with %s subprocess failed"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "read from %s subprocess failed"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s subprocess terminated with exit code %d"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "the argument to %s should be a single punctuation character"
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "invalid endianness: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requires a “-d directory” specification"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requires a “-l locale” specification"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s is only valid with %s or %s"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s is only valid with %s, %s or %s"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d translated message"
 msgstr[1] "%d translated messages"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d fuzzy translation"
 msgstr[1] ", %d fuzzy translations"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d untranslated message"
 msgstr[1] ", %d untranslated messages"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage: %s [OPTION] filename.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generate binary message catalog from textual translation description.\n"
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1785,17 +1825,17 @@ msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             input files\n"
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Operation mode:\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1804,7 +1844,7 @@ msgstr ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1813,12 +1853,12 @@ msgstr ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# mode: generate a .NET .dll file\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1827,40 +1867,40 @@ msgstr ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt mode: generate a Qt .qm file\n"
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                enable strict Uniforum mode\n"
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "If output file is -, output is written to standard output.\n"
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Output file location in Java mode:\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource name\n"
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1869,14 +1909,14 @@ msgstr ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1889,12 +1929,12 @@ msgstr ""
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Output file location in C# mode:\n"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1903,7 +1943,7 @@ msgstr ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1912,18 +1952,18 @@ msgstr ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Output file location in Tcl mode:\n"
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                base directory of .msg message catalogs\n"
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1932,12 +1972,12 @@ msgstr ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Input file interpretation:\n"
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1948,13 +1988,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          check language dependent format strings\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -1963,7 +2003,7 @@ msgstr ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1972,7 +2012,7 @@ msgstr ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1981,7 +2021,7 @@ msgstr ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1992,97 +2032,97 @@ msgstr ""
 "for\n"
 "                                menu items\n"
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             use fuzzy entries in output\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               binary file will not include the hash table\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            print statistics about translations\n"
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               increase verbosity level\n"
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "warning: PO file header missing or invalid\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "warning: charset conversion will not work\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "warning: PO file header fuzzy\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "warning: older versions of msgfmt will give an error on this\n"
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domain name “%s” not suitable as file name"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domain name “%s” not suitable as file name: will use prefix"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s”"
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2091,7 +2131,7 @@ msgstr ""
 "option ‘%c’ cannot be used before ‘J’ or ‘K’ or ‘T’ "
 "or ‘C’ or ‘X’ has been specified"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2100,7 +2140,7 @@ msgstr ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2175,24 +2215,24 @@ msgstr ""
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                use C escapes in output, no extended chars\n"
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generate sorted output\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sort output by file location\n"
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2202,7 +2242,7 @@ msgstr ""
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2213,12 +2253,12 @@ msgstr ""
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "Created %s.\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2227,12 +2267,12 @@ msgstr ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INPUTFILE       input POT file\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2243,12 +2283,12 @@ msgstr ""
 "file.\n"
 "If it is -, standard input is read.\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      write output to specified PO file\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2257,19 +2297,19 @@ msgstr ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          set target locale\n"
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         assume the PO file is automatically generated\n"
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2277,12 +2317,12 @@ msgstr ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "error reading current directory"
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2290,14 +2330,14 @@ msgstr ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s subprocess failed with exit code %d"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2314,22 +2354,22 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "English translations for %s package"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "present charset “%s” is not a portable encoding name"
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "two different charsets “%s” and “%s” in input file"
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -2337,7 +2377,7 @@ msgstr ""
 "input file ‘%s’ doesn't contain a header entry with a charset "
 "specification"
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2346,19 +2386,19 @@ msgstr ""
 "domain “%s” in input file ‘%s’ doesn't contain a header entry "
 "with a charset specification"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "target charset “%s” is not a portable encoding name."
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "warning: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2367,7 +2407,7 @@ msgstr ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2380,7 +2420,7 @@ msgstr ""
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2393,7 +2433,7 @@ msgstr ""
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2406,12 +2446,12 @@ msgstr ""
 "Output of ‘%s’ might be incorrect.\n"
 "Possible workarounds are:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Set LC_ALL to a locale with encoding %s.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2422,7 +2462,7 @@ msgstr ""
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2435,7 +2475,7 @@ msgstr ""
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2446,25 +2486,25 @@ msgstr ""
 "Output of ‘%s’ might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "plural expression can produce negative values"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu but plural expression can produce values as large as %lu"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "plural expression can produce division by zero"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "plural expression can produce integer overflow"
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2472,51 +2512,51 @@ msgstr ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Try using the following, valid for %s:"
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr "message catalog has plural form translations"
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "but header entry lacks a “plural=EXPRESSION” attribute"
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "but header entry lacks a “nplurals=INTEGER” attribute"
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "invalid nplurals value"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "invalid plural expression"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "but some messages have only one plural form"
 msgstr[1] "but some messages have only %lu plural forms"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "but some messages have one plural form"
 msgstr[1] "but some messages have %lu plural forms"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2524,91 +2564,91 @@ msgstr ""
 "message catalog has plural form translations, but lacks a header entry with "
 "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;”"
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘\\n"
 "[0m’"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘\\n"
 "[0m’"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr’ entries do not both begin with ‘\\n’"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgid_plural’ entries do not both end with ‘\\n"
 "[0m’"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr[%u]’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural handling is a GNU gettext extension"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr lacks the keyboard accelerator mark ‘%c’"
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr has too many keyboard accelerator marks ‘%c’"
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "headerfield ‘%s’ missing in header\n"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "header field ‘%s’ should start at beginning of line\n"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "some header fields still have the initial default value\n"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "field ‘%s’ still has initial default value\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: input is not valid in “%s” encoding"
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: error while converting from “%s” encoding to “%s” encoding"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "input file doesn't contain a header entry with a charset specification"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2617,7 +2657,7 @@ msgstr ""
 "Cannot convert from “%s” to “%s”. %s relies on iconv(), and iconv"
 "() does not support this conversion."
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2626,8 +2666,8 @@ msgstr ""
 "Conversion from “%s” to “%s” introduces duplicates: some "
 "different msgids become equal."
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2763,17 +2803,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suppress progress indicators\n"
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "this message should define plural forms"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "this message should not define plural forms"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2782,26 +2822,26 @@ msgstr ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " done.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s and explicit file names are mutually exclusive"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Usage: %s [OPTION] [FILE]...\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Convert binary message catalog to Uniforum style .po file.\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2810,12 +2850,12 @@ msgstr ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# mode: input is a .NET .dll file\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2824,24 +2864,24 @@ msgstr ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FILE ...                    input .mo files\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Input file location in Java mode:\n"
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2852,12 +2892,12 @@ msgstr ""
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Input file location in C# mode:\n"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2866,12 +2906,12 @@ msgstr ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Input file location in Tcl mode:\n"
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2880,17 +2920,17 @@ msgstr ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                write indented output style\n"
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                write strict uniforum style\n"
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2911,12 +2951,12 @@ msgstr ""
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              print only duplicates\n"
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2925,12 +2965,12 @@ msgstr ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2939,7 +2979,7 @@ msgstr ""
 "Charset “%s” is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2948,7 +2988,7 @@ msgstr ""
 "Charset “%s” is not supported. %s relies on iconv(),\n"
 "and iconv() does not support “%s”.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2956,15 +2996,15 @@ msgstr ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Continuing anyway, expect parse errors."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Continuing anyway."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2973,7 +3013,7 @@ msgstr ""
 "Charset “%s” is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2981,143 +3021,143 @@ msgstr ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "inconsistent use of #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "missing ‘msgstr[]’ section"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "missing ‘msgid_plural’ section"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "missing ‘msgstr’ section"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "first plural form has nonzero index"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "plural form has wrong index"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "too many errors, aborting"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "invalid multibyte sequence"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "incomplete multibyte sequence at end of file"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "incomplete multibyte sequence at end of line"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr "iconv failure"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "keyword “%s” unknown"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "invalid control sequence"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "end-of-file within string"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "end-of-line within string"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr "context separator  within string"
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "this file may not contain domain directives"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "duplicate message definition"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "this is the location of the first definition"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "file “%s” is truncated"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "file “%s” contains a not NUL terminated string"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file “%s” is not in GNU .mo format"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "file “%s” contains a not NUL terminated string, at %s"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "warning: invalid \\uxxxx syntax for Unicode character"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "warning: unterminated string"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "warning: syntax error"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "warning: unterminated key/value pair"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr "warning: syntax error, expected ‘;’ after string"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "warning: syntax error, expected ‘=’ or ‘;’ after string"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Written by %s and %s.\n"
@@ -3126,16 +3166,16 @@ msgstr "Written by %s and %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Recode Serbian text from Cyrillic to Latin script.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3144,27 +3184,27 @@ msgstr ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "input is not valid in “%s” encoding"
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error while converting from “%s” encoding to “%s” encoding"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr "expected two arguments"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Usage: %s [OPTION] URL FILE\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3173,12 +3213,12 @@ msgstr ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr "error writing stdout"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
@@ -3186,7 +3226,7 @@ msgstr ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
@@ -3194,7 +3234,7 @@ msgstr ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
@@ -3202,7 +3242,7 @@ msgstr ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3212,7 +3252,7 @@ msgstr ""
 "support them. Try generating a Java class using “msgfmt --java”, "
 "instead of a properties file."
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3220,58 +3260,51 @@ msgstr ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "cannot create output file “%s”"
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "standard output"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "failed to create directory “%s”"
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "compilation of C# class failed, please try --verbose"
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
+msgstr "compilation of C# class failed"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "not a valid Java class name: %s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr "compilation of Java class failed, please try to set $JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s” for writing"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3279,7 +3312,7 @@ msgstr ""
 "internationalized messages should not contain the ‘\\%c’ escape "
 "sequence"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3292,7 +3325,7 @@ msgstr ""
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3305,7 +3338,7 @@ msgstr ""
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3313,7 +3346,7 @@ msgstr ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3325,7 +3358,7 @@ msgstr ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3335,12 +3368,12 @@ msgstr ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "error while writing to %s subprocess"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3348,7 +3381,7 @@ msgstr ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3356,7 +3389,7 @@ msgstr ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3364,7 +3397,7 @@ msgstr ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3372,27 +3405,27 @@ msgstr ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: warning: unterminated string"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: warning: unterminated regular expression"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: warning: unterminated character constant"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3401,7 +3434,7 @@ msgstr ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3410,7 +3443,7 @@ msgstr ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3419,7 +3452,7 @@ msgstr ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3428,7 +3461,7 @@ msgstr ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3437,12 +3470,12 @@ msgstr ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv failure"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3451,32 +3484,32 @@ msgstr ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: warning: invalid Unicode character"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: warning: unterminated string constant"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: warning: ‘)’ found where ‘}’ was expected"
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: warning: ‘}’ found where ‘)’ was expected"
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3485,46 +3518,51 @@ msgstr ""
 "Language “glade” is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 
+#: src/x-java.c:492
+#, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: warning: lone surrogate U+%04X"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: can't find string terminator “%s” anywhere before EOF"
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: missing right brace on \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 "%s:%d: invalid interpolation (“\\l”) of 8bit character “%c”"
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 "%s:%d: invalid interpolation (“\\u”) of 8bit character “%c”"
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: invalid variable interpolation at “%c”"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 "%s:%d: invalid interpolation (“\\L”) of 8bit character “%c”"
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 "%s:%d: invalid interpolation (“\\U”) of 8bit character “%c”"
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3535,7 +3573,7 @@ msgstr ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3546,7 +3584,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3557,7 +3595,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3568,7 +3606,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3579,7 +3617,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3590,27 +3628,27 @@ msgstr ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unknown encoding “%s”. Proceeding with ASCII instead."
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: invalid string definition"
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: missing number after #"
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: invalid string expression"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3619,27 +3657,27 @@ msgstr ""
 "%s:%lu: warning: the syntax $“...” is deprecated due to security "
 "reasons; use eval_gettext instead"
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing cannot be used when output is written to stdout"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extract translatable strings from given input files.\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3648,24 +3686,24 @@ msgstr ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           write output to specified file\n"
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choice of input file language:\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3684,12 +3722,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   shorthand for --language=C++\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3698,7 +3736,7 @@ msgstr ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3707,22 +3745,22 @@ msgstr ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "By default the input files are assumed to be in ASCII.\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         join messages with existing file\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3731,17 +3769,17 @@ msgstr ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language specific options:\n"
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extract all strings\n"
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3754,7 +3792,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3763,7 +3801,7 @@ msgstr ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3774,7 +3812,7 @@ msgstr ""
 "argument\n"
 "                              number ARG of keyword WORD\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3787,63 +3825,78 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (only languages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recognize Qt format strings\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (only language C++)\n"
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --kde                   recognize KDE 4 format strings\n"
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 recognize Boost format strings\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 more detailed formatstring recognition result\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     write out a Java .properties file\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  set copyright holder in output\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr "      --package-name=PACKAGE  set package name in output\n"
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --package-version=VERSION  set package version in output\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3852,7 +3905,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3861,7 +3914,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3870,16 +3923,16 @@ msgstr ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: warning: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3888,7 +3941,7 @@ msgstr ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3897,7 +3950,7 @@ msgstr ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3911,7 +3964,7 @@ msgstr ""
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3921,27 +3974,27 @@ msgstr ""
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "ambiguous argument specification for keyword ‘%.*s’"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "warning: missing context for keyword ‘%.*s’"
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "warning: missing context for plural argument of keyword ‘%.*s’"
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "context mismatch between singular and plural form"
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3953,11 +4006,11 @@ msgstr ""
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "language ‘%s’ unknown"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
diff --git a/gettext-tools/po/en@quot.po b/gettext-tools/po/en@quot.po
index baeb7eae6..2953ac708 100644
--- a/gettext-tools/po/en@quot.po
+++ b/gettext-tools/po/en@quot.po
@@ -1,7 +1,7 @@
 # English translations for gettext-tools package.
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext-tools package.
-# Automatically generated, 2006.
+# Automatically generated, 2007.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools\n"
+"Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
-"PO-Revision-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"PO-Revision-Date: 2007-11-02 03:23+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -38,87 +38,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "invalid argument %s for %s"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "ambiguous argument %s for %s"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Valid arguments are:"
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "cannot find a temporary directory, try setting $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "cannot create a temporary directory using template “%s”"
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "cannot remove temporary file %s"
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "cannot remove temporary directory %s"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "write error"
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error while opening “%s” for reading"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "cannot open backup file “%s” for writing"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "error reading “%s”"
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "error writing “%s”"
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "error after reading “%s”"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() failed"
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C# compiler not found, try installing pnet"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# virtual machine not found, try installing pnet"
@@ -127,119 +128,119 @@ msgstr "C# virtual machine not found, try installing pnet"
 msgid "Unknown system error"
 msgstr "Unknown system error"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s subprocess failed"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: option ‘%s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: option ‘--%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: option ‘%c%s’ doesn't allow an argument\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: option ‘%s’ requires an argument\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unrecognized option ‘--%s’\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unrecognized option ‘%c%s’\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: illegal option -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: invalid option -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: option requires an argument -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: option ‘-W %s’ is ambiguous\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "invalid source_version argument to compile_java_class"
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "invalid target_version argument to compile_java_class"
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s”"
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java compiler not found, try installing gcj or set $JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Java virtual machine not found, try installing gij or set $JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s subprocess I/O error"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "cannot create pipe"
@@ -263,74 +264,74 @@ msgstr "cannot create pipe"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandle failed with error code 0x%08x"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle failed"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s subprocess"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subprocess got fatal signal %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr "‘%s’ is not a valid %s format string, unlike 'msgid'. Reason: %s"
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr ""
 "a format specification for argument %u, as in '%s', doesn't exist in ‘msgid’"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "a format specification for argument %u doesn't exist in ‘%s’"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr ""
 "format specifications in ‘msgid’ and ‘%s’ for argument %u are not the same"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "The directive number %u starts with | but does not end with |."
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -339,52 +340,52 @@ msgstr ""
 "In the directive number %u, the token after ‘<’ is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "In the directive number %u, the token after ‘<’ is not followed by '>'."
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "The string refers to argument number %u but ignores argument number %u."
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "number of format specifications in ‘msgid’ and ‘%s’ does not match"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "In the directive number %u, ‘{’ is not followed by an argument number."
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "In the directive number %u, ‘,’ is not followed by a number."
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 "The string ends in the middle of a directive: found ‘{’ without matching '}'."
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 "The directive number %u ends with an invalid character ‘%c’ instead of '}'."
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "The directive number %u ends with an invalid character instead of '}'."
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
@@ -392,22 +393,22 @@ msgstr ""
 "The string starts in the middle of a directive: found ‘}’ without matching "
 "'{'."
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "The string contains a lone ‘}’ after directive number %u."
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "In the directive number %u, the flags combination is invalid."
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "In the directive number %u, a precision is not allowed before '%c'."
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -416,31 +417,40 @@ msgstr ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "In the directive number %u, the precision specification is invalid."
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "In the directive number %u, flags are not allowed before '%c'."
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "‘msgid’ uses %%m but ‘%s’ doesn't"
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "‘msgid’ does not use %%m but ‘%s’ uses %%m"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "The string ends in the middle of a directive."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -448,14 +458,14 @@ msgstr ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
@@ -464,7 +474,7 @@ msgstr ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
@@ -473,7 +483,7 @@ msgstr ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
@@ -482,7 +492,7 @@ msgstr ""
 "In the directive number %u, the character ‘%c’ is not a valid conversion "
 "specifier."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -491,12 +501,12 @@ msgstr ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "The string refers to argument number %u in incompatible ways."
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -505,19 +515,19 @@ msgstr ""
 "In the directive number %u, the substring “%s” is not a valid date/time "
 "style."
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "In the directive number %u, “%s” is not followed by a comma."
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 "In the directive number %u, the substring “%s” is not a valid number style."
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -526,12 +536,12 @@ msgstr ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of “%s”, “%s”, “%s”, “%s”."
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "In the directive number %u, a choice contains no number."
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -540,7 +550,7 @@ msgstr ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', ‘#’ or '%s'."
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -549,20 +559,20 @@ msgstr ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "‘msgid’"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "a format specification for argument {%u} doesn't exist in ‘%s’"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr ""
 "format specifications in ‘msgid’ and ‘%s’ for argument {%u} are not the same"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -571,7 +581,7 @@ msgstr ""
 "In the directive number %u, parameter %u is of type ‘%s’ but a parameter of "
 "type ‘%s’ is expected."
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -586,33 +596,33 @@ msgstr[1] ""
 "In the directive number %u, too many parameters are given; expected at most %"
 "u parameters."
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "In the directive number %u, ‘%c’ is not followed by a digit."
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "In the directive number %u, the argument %d is negative."
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "The string ends in the middle of a ~/.../ directive."
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Found ‘~%c’ without matching '~%c'."
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "In the directive number %u, both the @ and the : modifiers are given."
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -621,26 +631,26 @@ msgstr ""
 "In the directive number %u, ‘~:[’ is not followed by two clauses, separated "
 "by '~;'."
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "In the directive number %u, ‘~;’ is used in an invalid position."
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "The string refers to some argument in incompatible ways."
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "format specifications in ‘msgid’ and ‘%s’ are not equivalent"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "format specifications in ‘%s’ are not a subset of those in ‘msgid’"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -649,12 +659,12 @@ msgstr ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "a format specification for argument ‘%s’ doesn't exist in ‘%s’"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -662,12 +672,12 @@ msgstr ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "The string refers to the argument named ‘%s’ in incompatible ways."
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -676,7 +686,7 @@ msgstr ""
 "format specifications in ‘msgid’ expect a mapping, those in ‘%s’ expect a "
 "tuple"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -685,7 +695,7 @@ msgstr ""
 "format specifications in ‘msgid’ expect a tuple, those in ‘%s’ expect a "
 "mapping"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -694,23 +704,27 @@ msgstr ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "‘msgid’"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr ""
 "format specifications in ‘msgid’ and ‘%s’ for argument ‘%s’ are not the same"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
+"‘msgid’ is a simple format string, but ‘%s’ is not: it contains an ‘L’ flag "
+"or a double-digit argument number"
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "The string refers to a shell variable with a non-ASCII name."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -718,7 +732,7 @@ msgstr ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
@@ -726,11 +740,11 @@ msgstr ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "The string refers to a shell variable with an empty name."
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
@@ -739,7 +753,7 @@ msgstr ""
 "In the directive number %u, the character ‘%c’ is not a digit between 1 and "
 "9."
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
@@ -748,73 +762,75 @@ msgstr ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "too many arguments"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage: %s [OPTION]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Print the machine's hostname.\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Output format:\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 short host name\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -825,74 +841,79 @@ msgstr ""
 "domain\n"
 "                                name, and aliases\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            addresses for the hostname\n"
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative output:\n"
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  display this help and exit\n"
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               output version information and exit\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "Report bugs to .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "could not get host name"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "at most one input file allowed"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -901,63 +922,63 @@ msgstr ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "Input file location:\n"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   input PO file\n"
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "If no input file is given or if it is -, standard input is read.\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "Output file location:\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      write output to specified file\n"
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -966,71 +987,71 @@ msgstr ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr "Message selection:\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            keep translated, remove untranslated messages\n"
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              remove ‘fuzzy’ marked messages\n"
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            keep ‘fuzzy’ marked messages\n"
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           remove obsolete #~ messages\n"
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         keep obsolete #~ messages\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribute manipulation:\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             set all messages ‘fuzzy’\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          set all messages obsolete\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        set all messages non-obsolete\n"
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1038,50 +1059,50 @@ msgid ""
 msgstr ""
 "      --clear-previous        remove the “previous msgid” from all messages\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Input file syntax:\n"
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1090,94 +1111,94 @@ msgstr ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "Output details:\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              write PO file even if empty\n"
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                write the .po file using indented style\n"
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           do not write ‘#: filename:line’ lines\n"
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          generate ‘#: filename:line’ lines (default)\n"
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     write out a Java .properties file\n"
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          set output page width\n"
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1186,31 +1207,31 @@ msgstr ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generate sorted output\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sort output by file location\n"
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1233,23 +1254,23 @@ msgstr ""
 "is specified, they will be taken from the first PO file to define them.\n"
 "File positions from all PO files will be cumulated.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               input files\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       get list of input files from FILE\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "If input file is -, standard input is read.\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1258,7 +1279,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1267,7 +1288,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1276,7 +1297,7 @@ msgstr ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
@@ -1284,7 +1305,7 @@ msgid ""
 msgstr ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1294,12 +1315,12 @@ msgstr ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          encoding for output\n"
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1308,27 +1329,46 @@ msgstr ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=STYLEFILE       specify CSS style rule file for --color\n"
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "no input files given"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "exactly 2 input files required"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Usage: %s [OPTION] def.po ref.pot\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1345,22 +1385,22 @@ msgstr ""
 "you have translated each and every message in your program.  Where an exact\n"
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      translations\n"
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     references to the sources\n"
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operation modifiers:\n"
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1369,59 +1409,59 @@ msgstr ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             consider fuzzy entries\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      consider untranslated entries\n"
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, c-format
 msgid "this message is untranslated"
 msgstr "this message is untranslated"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "this message needs to be reviewed by the translator"
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "this message is used but not defined..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...but this definition is similar"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "this message is used but not defined in %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "warning: this message is not used"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "found %d fatal error"
 msgstr[1] "found %d fatal errors"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "at least two files must be specified"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1442,7 +1482,7 @@ msgstr ""
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1451,40 +1491,40 @@ msgstr ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           don't write header with ‘msgid \"\"’ entry\n"
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converts a translation catalog to a different character encoding.\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Conversion target:\n"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "The default encoding is the current locale's encoding.\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indented output style\n"
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           suppress ‘#: filename:line’ lines\n"
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
@@ -1492,28 +1532,28 @@ msgid ""
 msgstr ""
 "      --add-location          preserve ‘#: filename:line’ lines (default)\n"
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strict Uniforum output style\n"
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "no input file given"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr "exactly one input file required"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Usage: %s [OPTION] INPUTFILE\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1526,22 +1566,22 @@ msgstr ""
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   input PO or POT file\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr "missing command name"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1556,7 +1596,7 @@ msgstr ""
 "msgexec's output.  msgexec's return code is the maximum return code\n"
 "across all invocations.\n"
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1565,42 +1605,42 @@ msgstr ""
 "A special builtin command called ‘0’ outputs the translation, followed by a\n"
 "null byte.  The output of “msgexec 0” is suitable as input for “xargs -0”.\n"
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       input PO file\n"
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr "write to stdout failed"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "write to %s subprocess failed"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr "missing filter name"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "at least one sed script must be specified"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Applies a filter to all translations of a translation catalog.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1609,19 +1649,19 @@ msgstr ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1632,126 +1672,126 @@ msgstr ""
 "commands\n"
 "                                to be executed\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             do not use C escapes in output (default)\n"
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indented output style\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr "Not yet implemented."
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "cannot set up nonblocking I/O to %s subprocess"
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "communication with %s subprocess failed"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "read from %s subprocess failed"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s subprocess terminated with exit code %d"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "the argument to %s should be a single punctuation character"
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "invalid endianness: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requires a “-d directory” specification"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requires a “-l locale” specification"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s is only valid with %s or %s"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s is only valid with %s, %s or %s"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d translated message"
 msgstr[1] "%d translated messages"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d fuzzy translation"
 msgstr[1] ", %d fuzzy translations"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d untranslated message"
 msgstr[1] ", %d untranslated messages"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage: %s [OPTION] filename.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generate binary message catalog from textual translation description.\n"
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1760,17 +1800,17 @@ msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             input files\n"
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Operation mode:\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1779,7 +1819,7 @@ msgstr ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1788,12 +1828,12 @@ msgstr ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# mode: generate a .NET .dll file\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1802,40 +1842,40 @@ msgstr ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt mode: generate a Qt .qm file\n"
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                enable strict Uniforum mode\n"
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "If output file is -, output is written to standard output.\n"
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Output file location in Java mode:\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource name\n"
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1844,14 +1884,14 @@ msgstr ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1864,12 +1904,12 @@ msgstr ""
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Output file location in C# mode:\n"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1878,7 +1918,7 @@ msgstr ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1887,18 +1927,18 @@ msgstr ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Output file location in Tcl mode:\n"
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                base directory of .msg message catalogs\n"
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1907,12 +1947,12 @@ msgstr ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Input file interpretation:\n"
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1923,13 +1963,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          check language dependent format strings\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -1938,7 +1978,7 @@ msgstr ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1947,7 +1987,7 @@ msgstr ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1956,7 +1996,7 @@ msgstr ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1967,97 +2007,97 @@ msgstr ""
 "for\n"
 "                                menu items\n"
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             use fuzzy entries in output\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               binary file will not include the hash table\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            print statistics about translations\n"
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               increase verbosity level\n"
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "warning: PO file header missing or invalid\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "warning: charset conversion will not work\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "warning: PO file header fuzzy\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "warning: older versions of msgfmt will give an error on this\n"
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domain name “%s” not suitable as file name"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domain name “%s” not suitable as file name: will use prefix"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s”"
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2066,7 +2106,7 @@ msgstr ""
 "option ‘%c’ cannot be used before ‘J’ or ‘K’ or ‘T’ or ‘C’ or ‘X’ has been "
 "specified"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2075,7 +2115,7 @@ msgstr ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2150,24 +2190,24 @@ msgstr ""
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                use C escapes in output, no extended chars\n"
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generate sorted output\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sort output by file location\n"
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2177,7 +2217,7 @@ msgstr ""
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2188,12 +2228,12 @@ msgstr ""
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "Created %s.\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2202,12 +2242,12 @@ msgstr ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INPUTFILE       input POT file\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2218,12 +2258,12 @@ msgstr ""
 "file.\n"
 "If it is -, standard input is read.\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      write output to specified PO file\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2232,19 +2272,19 @@ msgstr ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          set target locale\n"
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         assume the PO file is automatically generated\n"
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2252,12 +2292,12 @@ msgstr ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "error reading current directory"
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2265,14 +2305,14 @@ msgstr ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s subprocess failed with exit code %d"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2289,29 +2329,29 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "English translations for %s package"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "present charset “%s” is not a portable encoding name"
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "two different charsets “%s” and “%s” in input file"
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "input file ‘%s’ doesn't contain a header entry with a charset specification"
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2320,19 +2360,19 @@ msgstr ""
 "domain “%s” in input file ‘%s’ doesn't contain a header entry with a charset "
 "specification"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "target charset “%s” is not a portable encoding name."
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "warning: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2341,7 +2381,7 @@ msgstr ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2354,7 +2394,7 @@ msgstr ""
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2367,7 +2407,7 @@ msgstr ""
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2380,12 +2420,12 @@ msgstr ""
 "Output of ‘%s’ might be incorrect.\n"
 "Possible workarounds are:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Set LC_ALL to a locale with encoding %s.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2396,7 +2436,7 @@ msgstr ""
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2409,7 +2449,7 @@ msgstr ""
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2420,25 +2460,25 @@ msgstr ""
 "Output of ‘%s’ might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "plural expression can produce negative values"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu but plural expression can produce values as large as %lu"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "plural expression can produce division by zero"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "plural expression can produce integer overflow"
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2446,51 +2486,51 @@ msgstr ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Try using the following, valid for %s:"
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr "message catalog has plural form translations"
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "but header entry lacks a “plural=EXPRESSION” attribute"
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "but header entry lacks a “nplurals=INTEGER” attribute"
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "invalid nplurals value"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "invalid plural expression"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "but some messages have only one plural form"
 msgstr[1] "but some messages have only %lu plural forms"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "but some messages have one plural form"
 msgstr[1] "but some messages have %lu plural forms"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2498,81 +2538,81 @@ msgstr ""
 "message catalog has plural form translations, but lacks a header entry with "
 "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;”"
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘\\n’"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘\\n’"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "‘msgid’ and ‘msgstr’ entries do not both begin with ‘\\n’"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "‘msgid’ and ‘msgid_plural’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "‘msgid’ and ‘msgstr[%u]’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "‘msgid’ and ‘msgstr’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural handling is a GNU gettext extension"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr lacks the keyboard accelerator mark ‘%c’"
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr has too many keyboard accelerator marks ‘%c’"
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "headerfield ‘%s’ missing in header\n"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "header field ‘%s’ should start at beginning of line\n"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "some header fields still have the initial default value\n"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "field ‘%s’ still has initial default value\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: input is not valid in “%s” encoding"
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: error while converting from “%s” encoding to “%s” encoding"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "input file doesn't contain a header entry with a charset specification"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2581,7 +2621,7 @@ msgstr ""
 "Cannot convert from “%s” to “%s”. %s relies on iconv(), and iconv() does not "
 "support this conversion."
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2590,8 +2630,8 @@ msgstr ""
 "Conversion from “%s” to “%s” introduces duplicates: some different msgids "
 "become equal."
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2727,17 +2767,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suppress progress indicators\n"
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "this message should define plural forms"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "this message should not define plural forms"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2746,26 +2786,26 @@ msgstr ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " done.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s and explicit file names are mutually exclusive"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Usage: %s [OPTION] [FILE]...\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Convert binary message catalog to Uniforum style .po file.\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2774,12 +2814,12 @@ msgstr ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# mode: input is a .NET .dll file\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2788,24 +2828,24 @@ msgstr ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FILE ...                    input .mo files\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Input file location in Java mode:\n"
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2816,12 +2856,12 @@ msgstr ""
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Input file location in C# mode:\n"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2830,12 +2870,12 @@ msgstr ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Input file location in Tcl mode:\n"
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2844,17 +2884,17 @@ msgstr ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                write indented output style\n"
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                write strict uniforum style\n"
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2875,12 +2915,12 @@ msgstr ""
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              print only duplicates\n"
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2889,12 +2929,12 @@ msgstr ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2903,7 +2943,7 @@ msgstr ""
 "Charset “%s” is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2912,7 +2952,7 @@ msgstr ""
 "Charset “%s” is not supported. %s relies on iconv(),\n"
 "and iconv() does not support “%s”.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2920,15 +2960,15 @@ msgstr ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Continuing anyway, expect parse errors."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Continuing anyway."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2937,7 +2977,7 @@ msgstr ""
 "Charset “%s” is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2945,143 +2985,143 @@ msgstr ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "inconsistent use of #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "missing ‘msgstr[]’ section"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "missing ‘msgid_plural’ section"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "missing ‘msgstr’ section"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "first plural form has nonzero index"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "plural form has wrong index"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "too many errors, aborting"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "invalid multibyte sequence"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "incomplete multibyte sequence at end of file"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "incomplete multibyte sequence at end of line"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr "iconv failure"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "keyword “%s” unknown"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "invalid control sequence"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "end-of-file within string"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "end-of-line within string"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr "context separator  within string"
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "this file may not contain domain directives"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "duplicate message definition"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "this is the location of the first definition"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "file “%s” is truncated"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "file “%s” contains a not NUL terminated string"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file “%s” is not in GNU .mo format"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "file “%s” contains a not NUL terminated string, at %s"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "warning: invalid \\uxxxx syntax for Unicode character"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "warning: unterminated string"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "warning: syntax error"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "warning: unterminated key/value pair"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr "warning: syntax error, expected ‘;’ after string"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "warning: syntax error, expected ‘=’ or ‘;’ after string"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Written by %s and %s.\n"
@@ -3090,16 +3130,16 @@ msgstr "Written by %s and %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "Recode Serbian text from Cyrillic to Latin script.\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3108,27 +3148,27 @@ msgstr ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "input is not valid in “%s” encoding"
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error while converting from “%s” encoding to “%s” encoding"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr "expected two arguments"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Usage: %s [OPTION] URL FILE\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3137,12 +3177,12 @@ msgstr ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr "error writing stdout"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
@@ -3150,7 +3190,7 @@ msgstr ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
@@ -3158,7 +3198,7 @@ msgstr ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
@@ -3166,7 +3206,7 @@ msgstr ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3176,7 +3216,7 @@ msgstr ""
 "support them. Try generating a Java class using “msgfmt --java”, instead of "
 "a properties file."
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3184,65 +3224,58 @@ msgstr ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "cannot create output file “%s”"
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "standard output"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "failed to create directory “%s”"
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "compilation of C# class failed, please try --verbose"
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
+msgstr "compilation of C# class failed"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "not a valid Java class name: %s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr "compilation of Java class failed, please try to set $JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s” for writing"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internationalized messages should not contain the ‘\\%c’ escape sequence"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3255,7 +3288,7 @@ msgstr ""
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3268,7 +3301,7 @@ msgstr ""
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3276,7 +3309,7 @@ msgstr ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3288,7 +3321,7 @@ msgstr ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3298,12 +3331,12 @@ msgstr ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "error while writing to %s subprocess"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3311,7 +3344,7 @@ msgstr ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3319,7 +3352,7 @@ msgstr ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3327,7 +3360,7 @@ msgstr ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3335,27 +3368,27 @@ msgstr ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: warning: unterminated string"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: warning: unterminated regular expression"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: warning: unterminated character constant"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3364,7 +3397,7 @@ msgstr ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3373,7 +3406,7 @@ msgstr ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3382,7 +3415,7 @@ msgstr ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3391,7 +3424,7 @@ msgstr ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3400,12 +3433,12 @@ msgstr ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv failure"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3414,32 +3447,32 @@ msgstr ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: warning: invalid Unicode character"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: warning: unterminated string constant"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: warning: ‘)’ found where ‘}’ was expected"
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: warning: ‘}’ found where ‘)’ was expected"
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3448,42 +3481,47 @@ msgstr ""
 "Language “glade” is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 
+#: src/x-java.c:492
+#, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: warning: lone surrogate U+%04X"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: can't find string terminator “%s” anywhere before EOF"
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: missing right brace on \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: invalid interpolation (“\\l”) of 8bit character “%c”"
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: invalid interpolation (“\\u”) of 8bit character “%c”"
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: invalid variable interpolation at “%c”"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: invalid interpolation (“\\L”) of 8bit character “%c”"
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: invalid interpolation (“\\U”) of 8bit character “%c”"
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3494,7 +3532,7 @@ msgstr ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3505,7 +3543,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3516,7 +3554,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3527,7 +3565,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3538,7 +3576,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3549,27 +3587,27 @@ msgstr ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unknown encoding “%s”. Proceeding with ASCII instead."
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: invalid string definition"
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: missing number after #"
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: invalid string expression"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3578,27 +3616,27 @@ msgstr ""
 "%s:%lu: warning: the syntax $“...” is deprecated due to security reasons; "
 "use eval_gettext instead"
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing cannot be used when output is written to stdout"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extract translatable strings from given input files.\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3607,24 +3645,24 @@ msgstr ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           write output to specified file\n"
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choice of input file language:\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3643,12 +3681,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   shorthand for --language=C++\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3657,7 +3695,7 @@ msgstr ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3666,22 +3704,22 @@ msgstr ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "By default the input files are assumed to be in ASCII.\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         join messages with existing file\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3690,17 +3728,17 @@ msgstr ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language specific options:\n"
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extract all strings\n"
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3713,7 +3751,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3722,7 +3760,7 @@ msgstr ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3733,7 +3771,7 @@ msgstr ""
 "argument\n"
 "                              number ARG of keyword WORD\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3746,63 +3784,78 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (only languages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recognize Qt format strings\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (only language C++)\n"
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --kde                   recognize KDE 4 format strings\n"
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 recognize Boost format strings\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 more detailed formatstring recognition result\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     write out a Java .properties file\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  set copyright holder in output\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr "      --package-name=PACKAGE  set package name in output\n"
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --package-version=VERSION  set package version in output\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3811,7 +3864,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3820,7 +3873,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3829,16 +3882,16 @@ msgstr ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: warning: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3847,7 +3900,7 @@ msgstr ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3856,7 +3909,7 @@ msgstr ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3869,7 +3922,7 @@ msgstr ""
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3879,27 +3932,27 @@ msgstr ""
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "ambiguous argument specification for keyword ‘%.*s’"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "warning: missing context for keyword ‘%.*s’"
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "warning: missing context for plural argument of keyword ‘%.*s’"
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "context mismatch between singular and plural form"
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3911,11 +3964,11 @@ msgstr ""
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "language ‘%s’ unknown"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
diff --git a/gettext-tools/po/es.po b/gettext-tools/po/es.po
index aefeb9130..8356bf052 100644
--- a/gettext-tools/po/es.po
+++ b/gettext-tools/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2005-06-27 17:09-0500\n"
 "Last-Translator: Max de Mendizábal \n"
 "Language-Team: Spanish \n"
@@ -16,87 +16,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "el argumento %s es inválido para %s"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "el argumento %s es ambiguo para %s"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Los argumentos válidos son:"
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "no se puede encontrar un directorio temporal, pruebe poner $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "no se puede crear el fichero de salida \"%s\""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "error de escritura"
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error al abrir el fichero \"%s\" para lectura"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "no se puede abrir el fichero de respaldo \"%s\" para escritura"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "error al leer \"%s\""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "error al escribir \"%s\""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "error después de leer \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fallo en fdopen()"
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "No se encontró al compilador de C#, intente instalar pnet"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "No se encontró a la máquina virtual de C#, intente instalar pnet"
@@ -107,124 +108,124 @@ msgstr "No se encontr
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "fallo en el subproceso %s"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: la opción `%c%s' no admite ningún argumento\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida `%c%s'\n"
 
 # acepto la sugerencia de em en cuanto a que inválida parece cárcel
 # o inútil pero mejor puse inválida
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción inválida -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción inválida -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción `-W %s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "fallo al crear \"%s\""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "hubo un error al escribir el fichero \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "No se encontró a la máquina virtual de Java, intente instalar gij o poner "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "error de E/S en el subproceso %s"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "Memoria agotada"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "no se puede crear la tubería"
@@ -248,47 +249,47 @@ msgstr "no se puede crear la tuber
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 "fallo de duplicación de manejador (DuplicateHandle) con código de error 0x%"
 "08x"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "fallo en _open_osfhandle"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "subproceso %s"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "el subproceso %s tiene una señal fatal %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 "'%s' no es un formato de cadena válido %s, a diferencia de 'msgid'. Razón: %s"
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
@@ -296,18 +297,18 @@ msgstr ""
 "una especificación de formato para el argumento %u, como en '%s', no existe "
 "en 'msgid'"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "una especificación de formato para el argumento %u no existe en '%s'"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
@@ -315,13 +316,13 @@ msgstr ""
 "las especificaciones de formato en 'msgid' y '%s' para el argumento %u no "
 "son las mismas"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, fuzzy, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 "La instrucción número %u termina con un carácter inválido en vez de un '}'."
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -331,44 +332,44 @@ msgstr ""
 "macro especificador de formato. Los nombres de macro válidos están listados "
 "en el ISO C 99 sección 7.8.1."
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "En la instrucción número %u, el token posterior a '<' no está seguido por "
 "'>'."
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "La cadena se refiere al argumento número %u, pero ignora el argumento número "
 "%u."
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "el número de especificaciones de formato en `msgid' y '%s' no coincide"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 "En la instrucción número %u, '{' no está seguido de un número de argumento."
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "En la instrucción número %u, ',' no está seguida de un número."
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 "La cadena termina en medio de una instrucción: se encontró un '{' sin su '}' "
 "correspondiente. "
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
@@ -376,13 +377,13 @@ msgstr ""
 "La instrucción número %u termina con un carácter inválido '%c' en vez de un "
 "'}'."
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 "La instrucción número %u termina con un carácter inválido en vez de un '}'."
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
@@ -390,23 +391,23 @@ msgstr ""
 "La cadena comienza en medio de una instrucción: se encontró un '}' sin su "
 "'{' correspondiente."
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "La cadena contiene un '}' solitario posterior a la instrucción %u."
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "En la instrucción número %u, el argumento %d es negativo."
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 "En la instrucción número %u, las banderas no están permitidas antes de '%c'."
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -415,32 +416,40 @@ msgstr ""
 "En la instrucción número %u, el número de argumento 0 no es un entero "
 "positivo."
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"En la instrucción número %u, las banderas no están permitidas antes de '%c'."
+
+#: src/format-gcc-internal.c:404
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "En la instrucción número %u, el argumento %d es negativo."
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 "En la instrucción número %u, las banderas no están permitidas antes de '%c'."
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "'msgid' utiliza %%m pero '%s' no"
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' no utiliza %%m pero '%s' utiliza %%m"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "La cadena termina en medio de una instrucción."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -448,7 +457,7 @@ msgstr ""
 "La cadena se refiere a ambos argumentos a través de números de argumento "
 "absolutos y a través de especificaciones de argumentos no numerados."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
@@ -456,7 +465,7 @@ msgstr ""
 "En la instrucción número %u, el número de argumento 0 no es un entero "
 "positivo."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
@@ -465,7 +474,7 @@ msgstr ""
 "En la instrucción número %u, la anchura del argumento número 0 no es un "
 "entero positivo."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
@@ -474,7 +483,7 @@ msgstr ""
 "En la instrucción número %u, la precisión del argumento número 0 no es un "
 "entero positivo."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
@@ -483,7 +492,7 @@ msgstr ""
 "En la instrucción número %u, el carácter '%c' no es un especificador de "
 "conversión válido."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -492,13 +501,13 @@ msgstr ""
 "El carácter que termina la instrucción número %u no es un especificador de "
 "conversión válido."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 "La cadena se refiere al número de argumento %u de formas incompatibles."
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -507,12 +516,12 @@ msgstr ""
 "En la instrucción número %u, la subcadena \"%s\" no está en un estilo de "
 "fecha/hora válido."
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "En la instrucción número %u, \"%s\" no está seguido de una coma."
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
@@ -520,7 +529,7 @@ msgstr ""
 "En la instrucción número %u, la subcadena \"%s\" no es un estilo de número "
 "válido."
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -529,12 +538,12 @@ msgstr ""
 "En la instrucción número %u, el número de argumento no está seguido por una "
 "coma y uno de los siguientes \"%s\", \"%s\", \"%s\", \"%s\"."
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "En la instrucción número %u, una opción contiene un valor no numérico."
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -543,7 +552,7 @@ msgstr ""
 "En la instrucción número %u, una opción contiene un número que no está "
 "seguido por '<', '#' o '%s'."
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -552,12 +561,12 @@ msgstr ""
 "una especificación de formato para el argumento {%u}, como en '%s', no "
 "existe en 'msgid'"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "una especificación de formato para el argumento {%u} no existe en '%s'"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -565,8 +574,8 @@ msgstr ""
 "las especificaciones de formato en 'msgid' y '%s' para el argumento {%u} no "
 "son las mismas"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -575,7 +584,7 @@ msgstr ""
 "En la instrucción número %u, el parámetro %u es de tipo '%s', pero se "
 "requiere de un parámetro de tipo '%s'."
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -590,33 +599,33 @@ msgstr[1] ""
 "En la instrucción número %u se dieron demasiados parámetros; se esperan a lo "
 "más %u parámetros."
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "En la instrucción número %u, '%c' no está seguida de un dígito."
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "En la instrucción número %u, el argumento %d es negativo."
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "La cadena termina en medio de una instrucción ~/.../."
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Se encontró '~%c' sin su '~%c' correspondiente."
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "En la instrucción número %u, deben darse los modificadores @ y :."
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -625,28 +634,28 @@ msgstr ""
 "En la instrucción número %u, '~:[' no está seguido de dos cláusulas "
 "separadas por '~;'."
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "En la instrucción número %u, '~;' se utilizó en una posición inválida."
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "La cadena se refiere a algún argumento de forma incompatible."
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "las especificaciones de formato en `msgid' y '%s' no son equivalentes"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr ""
 "las especificaciones de formato en '%s' no son un subconjunto de aquellas en "
 "'msgid'"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -655,12 +664,12 @@ msgstr ""
 "En la instrucción número %u, el  tamaño del especificador es incompatible "
 "con el especificador de conversión '%c'."
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "una especificación de formato para el argumento '%s' no existe en '%s'"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -668,13 +677,13 @@ msgstr ""
 "La cadena se refiere a ambos argumentos a través de números de argumento "
 "absolutos y a través de especificaciones de argumentos no numerados."
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "La cadena se refiere al argumento denominado '%s' en formas incompatibles."
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -683,7 +692,7 @@ msgstr ""
 "las especificaciones de formato en `msgid' requieren un mapeo, y aquellas en "
 "'%s' requieren una tupla"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -692,7 +701,7 @@ msgstr ""
 "las especificaciones de formato en `msgid' requieren una tupla y aquellas en "
 "'%s' requieren un mapeo"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -701,7 +710,7 @@ msgstr ""
 "una especificación de formato para el argumento '%s', como en '%s', no "
 "existe en 'msgid'"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
@@ -709,17 +718,19 @@ msgstr ""
 "las especificaciones de formato en 'msgid' y '%s' para el argumento '%s' no "
 "son las mismas"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "Referencias múltiples a %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 "La cadena se refiere a una variable de entorno con un nombre que no es ASCII."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -727,7 +738,7 @@ msgstr ""
 "La cadena se refiere a una variable de entorno con una sintáxis compleja. "
 "Esta sintáxis no se admite aquí debido a potenciales problemas de seguridad."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
@@ -735,11 +746,11 @@ msgstr ""
 "La cadena se refiere a una variable de entorno cuyo valor podría ser "
 "distinto dentro de las funciones del intérprete de comandos."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "La cadena se refiere a una variable de entrono con un nombre vacío."
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
@@ -747,7 +758,7 @@ msgid ""
 msgstr ""
 "En la instrucción número %u, el carácter '%c' no es un dígito entre 1 y 9."
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
@@ -755,74 +766,71 @@ msgid ""
 msgstr ""
 "El carácter que termina la instrucción número %u no es un dígito entre 1 y 9."
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Esto es software libre; vea el código fuente para las condiciones de copia.\n"
-"No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
-"FIN DETERMINADO.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Modo de empleo: %s [OPCIÓN]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Muestra el nombre de la máquina.\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Formato de salida:\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 nombre de corto de la máquina\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -833,75 +841,80 @@ msgstr ""
 "nombre\n"
 "                               completo del dominio calificado,\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 "  -i, --ip-address            direcciones para el nombre de la máquina\n"
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Salida informativa:\n"
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  muestra esta ayuda y finaliza\n"
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               muestra la versión y finaliza\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "Comunicar los `bugs' a .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "no se pudo obtener el nombre de la máquina"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "sólo se permite un fichero de entrada máximo"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s y %s son mutuamente excluyentes"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -910,10 +923,10 @@ msgstr ""
 "Filtra los mensajes de un catálogo de traducción de acuerdo con sus\n"
 "atributos, y luego manipula los atributos.\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -922,23 +935,23 @@ msgstr ""
 "obligatorios para las opciones cortas.\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "Localización del fichero de entrada:\n"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FICHERODEENTRADA            fichero PO de entrada\n"
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -947,33 +960,33 @@ msgstr ""
 "ficheros\n"
 "                              de entrada\n"
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Si no se especifica un fichero de entrada o si es -, se lee la entrada "
 "estándar.\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "Localización del fichero de salida:\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FICHERO   escribe la salida al FICHERO especificado\n"
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -982,12 +995,12 @@ msgstr ""
 "Los resultados se escriben a la salida estándar si no se especifica ningún\n"
 "fichero de salida o si es -.\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selección de mensaje:\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -995,7 +1008,7 @@ msgstr ""
 "     --translated             mantiene lo traducido, elimina los mensajes "
 "sin traducir\n"
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1003,61 +1016,61 @@ msgstr ""
 "      --untranslated          mantiene lo no traducido, elimina los mensajes "
 "traducidos\n"
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              elimina los mensajes difusos marcados como "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            mantiene los mensajes difusos marcados con "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           elimina los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantiene los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulación de atributos:\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             marca todos los mensajes como difusos 'fuzzy'\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           marca todos los mensajes como no difusos "
 "(no-'fuzzy')\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          marca todos los mensajes como obsoletos\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        marca todos los mensajes como no-obsoletos\n"
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1066,7 +1079,7 @@ msgstr ""
 "      --clear-fuzzy           marca todos los mensajes como no difusos "
 "(no-'fuzzy')\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1074,7 +1087,7 @@ msgstr ""
 "      --only-file=FICHERO.po  manipula sólo las entradas enlistadas en el "
 "FICHERO.po\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1082,28 +1095,28 @@ msgstr ""
 "      --ignore-file=FICHERO.po  manipula sólo las entradas no listadas en "
 "FICHERO.po\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 sinónimo de --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              sinónimo de --only-obsolete --clean-obsolete\n"
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintáxis del fichero de entrada:\n"
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1111,8 +1124,8 @@ msgstr ""
 "  -P, --properties-input      el fichero de entrada está en la sintáxis de ."
 "properties de Java\n"
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1121,17 +1134,17 @@ msgstr ""
 "    --stringtable-input     el fichero de entrada está en la sintáxis de ."
 "strings de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalles de salida:\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1139,9 +1152,9 @@ msgstr ""
 "  -e, --no-escape             no utiliza escapes de C en la salida (por "
 "omisión)\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1149,55 +1162,55 @@ msgstr ""
 "  -E, --escape                utiliza escapes de C en la salida, sin "
 "carácteres extendidos\n"
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              escribe un fichero PO aún si está vacío\n"
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                escribe el fichero .po utilizando estilo con "
 "sangrados\n"
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           no escribe las líneas '#: fichero:línea'\n"
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location       genera líneas '#: fichero:línea' (por omisión)\n"
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                escribe un fichero .po con Uniforum estricto\n"
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     escribe un fichero .properties de Java\n"
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1205,16 +1218,16 @@ msgstr ""
 "     --stringtable-output     escribe un fichero .strings de NeXTstep/"
 "GNUstep\n"
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NÚMERO          pone la anchura de la página de salida\n"
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1225,32 +1238,32 @@ msgstr ""
 "                              sean mayores a la anchura de la página de "
 "salida\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera una salida ordenada\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          ordena la salida por ubicación de fichero\n"
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1276,25 +1289,25 @@ msgstr ""
 "fichero PO para definirlos. Las posiciones dentro del fichero de todos\n"
 "los ficheros PO se conservarán.  \n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHERODEENTRADA ...        ficheros de entrada\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FICHERO    obtiene una lista de ficheros de entrada del "
 "FICHERO\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Si el fichero de entrada es -, se lee la entrada estándar.\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1305,7 +1318,7 @@ msgstr ""
 "                              definiciones, si no se especifica, es "
 "infinito\n"
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1315,7 +1328,7 @@ msgstr ""
 "de\n"
 "                              definiciones, si no se pone, utiliza 0\n"
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1324,7 +1337,7 @@ msgstr ""
 "  -u, --unique                abreviatura de --less-than=2, solicita\n"
 "                              que sólo se impriman los mensajes únicos\n"
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
@@ -1333,7 +1346,7 @@ msgstr ""
 "  -P, --properties-input      los ficheros de entrada están en la sintáxis ."
 "properties de Java\n"
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1343,12 +1356,12 @@ msgstr ""
 "      --stringtable-input     los ficheros de entrada están en la sintáxis\n"
 "                              .strings de NeXTstep/GNUstep.\n"
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOMBRE        codifica para la salida\n"
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1357,22 +1370,36 @@ msgstr ""
 "      -use-first              utiliza la primera traducción disponible para\n"
 "                              cada mensaje, no mezcla varias traducciones\n"
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "no se especificaron ficheros de entrada"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "se requieren exactamente 2 ficheros de entrada"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
@@ -1437,7 +1464,7 @@ msgstr "Modo de empleo: %s [OPCI
 # y en otros de otra (la frase no era exactamente igual).
 # 11061996mm: En particular en gettext el letrero es estándar, por lo que
 # prefiero "también son" que, creo suena mejor. Homogeinizo todo.
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1456,22 +1483,22 @@ msgstr ""
 "se encuentre un resultado exacto, se utilizará coincidencia difusa, de\n"
 "tal forma que la precisión del diagnóstico sea mejor.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traducciones\n"
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.po                      referencias a las fuentes\n"
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificadores de operación:\n"
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1480,45 +1507,45 @@ msgstr ""
 "  -m, --multi-domain          aplica ref.pot a cada uno de los dominios en\n"
 "                              def.po\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 "  -f, --use-fuzzy             utiliza entradas difusas para la salida\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --untranslated          mantiene lo no traducido, elimina los mensajes "
 "traducidos\n"
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "atención: este mensaje no se utiliza"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "este mensaje se usa pero no está definido..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...pero esta definición es parecida"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "este mensaje se usa pero no está definido en %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "atención: este mensaje no se utiliza"
@@ -1544,19 +1571,19 @@ msgstr "atenci
 #
 # 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la
 # aventura. Quizá no sea tan malo como dice Enrique, a menos que...
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "se encontró el error fatal %d"
 msgstr[1] "se encontraron %d errores fatales"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "se deben especificar por lo menos dos ficheros"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1579,7 +1606,7 @@ msgstr ""
 "defina. Las posiciones dentro del fichero de todos los ficheros PO se\n"
 "conservarán.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1589,44 +1616,44 @@ msgstr ""
 "                              número de definiciones, si no se pone,\n"
 "                              el valor por omisión es 0\n"
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "     --omit-header          no escribe la línea de encabezado `msgid \"\"'\n"
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Convierte un catálogo de traducción a una codificación de carácteres "
 "distinta.\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Blanco de conversión:\n"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "La codificación por omisión es la que está en uso por la funcion locale.\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                estilo de salida con sangrías\n"
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           no escribe las líneas '#: fichero:línea'\n"
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
@@ -1635,29 +1662,29 @@ msgstr ""
 "      --add-location          genera líneas '#: fichero:línea' (por "
 "omisión)\n"
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "no se especificó el fichero de entrada"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr "se requieren exactamente un ficheros de entrada"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Modo de empleo: %s [OPCIÓN] FICHEROENTRADA\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1670,22 +1697,22 @@ msgstr ""
 "(generalmente creado por xgettext). Las entradas no traducidas son\n"
 "asignadas a una traducción que es idéntica a la del msgid.\n"
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FICHEROENTRADA              fichero de entrada PO o POT\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr "Se omitió el nombre de la instrucción"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] INSTRUCCIÓN [OPCIONES-DE-LA-INSTRUCCIÓN]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1701,7 +1728,7 @@ msgstr ""
 "msgexec es el máximo de los códigos de retornos obtenidos a lo largo de \n"
 "todas las invocaciones.\n"
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1711,43 +1738,43 @@ msgstr ""
 "traducción, seguido por un byte nulo. La salida de \"msgexec 0\" se puede \n"
 "utilizar como entrada para \"xargs -0\".\n"
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FICHEROENTRADA  fichero PO de entrada\n"
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr "fallo en la escritura a la salida estándar"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "fallo en la escritura la subproceso %s"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr "falta el nombre del filtro"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "se debe especificar al menos un guión de sed"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] FILTRO [OPCIONES-DEL-FILTRO]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Aplica un filtro a todas las traducciones de un catálogo de traducción.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1756,12 +1783,12 @@ msgstr ""
 "El FILTRO puede ser cualquier programa que lea una traducción de la entrada\n"
 "estándar y escriba una traducción modificada a la salida estándar.\n"
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Algunas OPCIONES-DEL-FILTRO cuando el FILTRO es 'sed':\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
@@ -1769,7 +1796,7 @@ msgstr ""
 "  -e, --expression=GUIÓN       añade un GUIÓN a las instrucciones que serán\n"
 "                               ejecutadas\n"
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1779,7 +1806,7 @@ msgstr ""
 "  -f, --file=FICHEROGUIÓN     añade el contenido del FICHEROGUIÓN a las\n"
 "                              instrucciones que serán ejecutadas\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1787,7 +1814,7 @@ msgstr ""
 "  -n, --quiet, --silent        elimina la impresión automática del espacio\n"
 "                               de patrones\n"
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1795,13 +1822,13 @@ msgstr ""
 "      --no-escape             no utiliza las secuencias de escape tipo C\n"
 "                              en la salida (por omisión)\n"
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 "      --indent                escribe el fichero .po utilizando sangrías\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1810,101 +1837,101 @@ msgstr ""
 "modificación,\n"
 "                              es decir, no la filtra\n"
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr "Aún no está implementado."
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "no se puede eliminar el bloqueo de la E/S del subproceso %s"
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "fallo en la comunicación con el subproceso %s"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "fallo en la lectura del subproceso %s"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "el subproceso %s terminó con un código de salida %d"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "el argumento a %s debe ser un solo carácter de puntuación"
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requiere que se especifique un \"-d directorio\""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requiere que se especifique un \"-l local\""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s sólo es válido con %s o %s"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s sólo es válido con %s, %s o %s"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaje traducido"
 msgstr[1] "%d mensajes traducidos"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducción difusa"
 msgstr[1] ", %d traducciones difusas"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensaje sin traducir"
 msgstr[1] ", %d mensajes sin traducir"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genera un catálogo binario de mensajes a partir de la descripción de la "
 "traducción textual.\n"
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1913,17 +1940,17 @@ msgstr ""
 "Los argumentos obligatorios en las opciones largas también lo son para las \n"
 "opciones cortas. De forma similar se comportan los argumentos opcionales.\n"
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fichero.po ...             ficheros de entrada\n"
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operación:\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1932,7 +1959,7 @@ msgstr ""
 "  -j, --java                  Modo Java: la entrada es una clase de Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1941,13 +1968,13 @@ msgstr ""
 "      --java2                 como --java, y supone el uso de Java2\n"
 "                              (JDK 1.2 o superior)\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                Modo C#: genera un fichero .dll de .NET\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1956,40 +1983,40 @@ msgstr ""
 "      --csharp-resources      modo de recursos C#: genera un fichero ."
 "resources de .NET\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Modo tcl: genera un fichero .msg tcl/msgcat\n"
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Modo Qt: genera un fichero .qm de Qt\n"
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Si el fichero de salida es -,  se escribe en la salida estándar.\n"
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Localización del fichero de salida en modo Java:\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RECURSO      nombre del recurso\n"
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1997,14 +2024,14 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOCAL          nombre local, ya sea idioma o idioma_PAIS\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORIO               directorio base de la jerarquía de clases\n"
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2016,12 +2043,12 @@ msgstr ""
 "recurso, separados por un guión bajo. La opción -d es obligatoria. La clase\n"
 "se escribe bajo el directorio especificado.\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Localización del fichero de salida en modo C#:\n"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2030,7 +2057,7 @@ msgstr ""
 "  -d DIRECTORIO               directorio base de los ficheros .dll de "
 "dependencias locales\n"
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2040,19 +2067,19 @@ msgstr ""
 "un subdirectorio del directorio especificado cuyo nombre dependerá de la "
 "localización.\n"
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Localización del fichero de salida en modo Tcl:\n"
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORIO               directorio base de los catálogos de\n"
 "                              mensajes .msg\n"
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2061,12 +2088,12 @@ msgstr ""
 "Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretación del fichero de entrada:\n"
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2077,7 +2104,7 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
@@ -2085,7 +2112,7 @@ msgstr ""
 "del\n"
 "                              idioma\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2094,7 +2121,7 @@ msgstr ""
 "      --check-header          verifica la presencia y contenido de la\n"
 "                              línea de encabezado\n"
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2104,7 +2131,7 @@ msgstr ""
 "instrucciones\n"
 "                              del dominio y la opción --output-file\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2114,7 +2141,7 @@ msgstr ""
 "el\n"
 "                              msgfmt de X/Open\n"
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2124,13 +2151,13 @@ msgstr ""
 "       --check-accelerators[=CAR]  revisa la presencia de aceleradores de\n"
 "                                   teclado para los elementos del menú\n"
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             utiliza entradas difusas para la salida\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2138,7 +2165,7 @@ msgstr ""
 "   -a, --alignment=NÚMERO      alinea las cadenas al NÚMERO de bytes\n"
 "                               (por omisión es: %d)\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2146,52 +2173,52 @@ msgstr ""
 "      --no-hash               el fichero binario no incluirá la tabla de "
 "hash\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            muestra las estadísticas sobre las "
 "traducciones\n"
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta el cantidad de mensajes\n"
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "atención: el encabezado del fichero PO no existe o es inválido\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "atención: la conversión del conjunto de caracteres no funcionará\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "atención: el encabezado del fichero PO está difuso\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "atención: las versiones anteriores de msgfmt producirán un error en esto\n"
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "el nombre de dominio \"%s\" no es válido como nombre de fichero"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "el nombre del dominio \"%s\" no es válido como nombre de fichero:\n"
 "se utilizará un prefijo"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "la instrucción `domain %s' no tiene efecto"
@@ -2200,35 +2227,35 @@ msgstr "la instrucci
 # Ignorar es no saber (not to know). "to ignore" es "no hacer caso".
 # Sugerencia: Descartar. sv
 # Excelente palabreja. Me gusta mucho. mm
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "se descarta la línea vacía `msgstr'"
 
 # Lo mismo. sv
 # Ok. mm
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "se descarta la línea difusa `msgstr'"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error al leer \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2237,7 +2264,7 @@ msgstr ""
 "la opción '%c' no se puede usar antes de que 'K', 'T' o 'C' hayan sido "
 "especificadas"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2246,7 +2273,7 @@ msgstr ""
 "Extrae todos los mensajes de un catálogo de traducción que coincidan con un\n"
 "patrón dado o pertenezcan a algunos de los ficheros fuente dados.\n"
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2321,7 +2348,7 @@ msgstr ""
 "-f, --file=FICHERO           obtiene al PATRÓN del FICHERO\n"
 "-i, --ignore-case            indistingue si es mayúsculas o minúsculas\n"
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2330,18 +2357,18 @@ msgstr ""
 "caracteres\n"
 "                              extendidos\n"
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           genera una salida ordenada\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          ordena la salida por localización de ficheros\n"
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2351,7 +2378,7 @@ msgstr ""
 "de entorno LANG, tal como se describe en el fichero ABOUT-NLS. Esto\n"
 "es necesario para que se puedan probar las traducciones.\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2362,12 +2389,12 @@ msgstr ""
 "Favor de especificar el formato local a través de la opción --locale o\n"
 "el fichero de salida .po a través de la opción --output-file.\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "Creado %s.\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2376,12 +2403,12 @@ msgstr ""
 "Crea un nuevo fichero PO, inicializando la metainformación con valores\n"
 "tomados del entorno del usuario.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FICHEROENTRADA  fichero de entrada POT\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2391,13 +2418,13 @@ msgstr ""
 "Si no se da el fichero de entrada, el fichero POT se busca en el directorio\n"
 "actual. Si es -, se lee la entrada estándar.\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2407,13 +2434,13 @@ msgstr ""
 "de la selección local del usuario. Si es -, los resultados se escriben en\n"
 "la salida estándar.\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 "   -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2421,7 +2448,7 @@ msgstr ""
 "      --no-translator         supone que el fichero PO será generado\n"
 "                              automáticamente\n"
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2430,12 +2457,12 @@ msgstr ""
 "Favor de especificar el fichero .pot de entrada utilizando la opción --"
 "input\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "error en la lectura del directorio actual"
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2444,14 +2471,14 @@ msgstr ""
 "Favor de especificar el fichero .pot de entrada utilizando la opción --"
 "input\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "fallo en el subproceso %s con código de salida %d"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2467,26 +2494,26 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traducciones al español para el paquete %s"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "el conjunto de caracteres actual \"%s\" no es un nombre de codificación "
 "portátil"
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 "hay dos distintos conjuntos de caracteres \"%s\" y \"%s\" en el fichero de "
 "entrada"
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -2494,7 +2521,7 @@ msgstr ""
 "el fichero de entrada `%s' no contiene una línea de encabezado con la "
 "especificación del conjunto de caracteres"
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2503,21 +2530,21 @@ msgstr ""
 "el dominio \"%s\" en el fichero de entrada `%s' no contiene una línea de\n"
 "encabezado con la especificación del conjunto de caracteres"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "el conjunto de caracteres destino \"%s\" no es un nombre de codificación "
 "portátil."
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "atención: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2526,7 +2553,7 @@ msgstr ""
 "Los ficheros de entrada contienen mensajes en distintas codificaciones,\n"
 "UTF-8 entre otras. Por ello se convierte la salida a UTF-8.\n"
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2538,7 +2565,7 @@ msgstr ""
 "%s y %s entre otras.\n"
 "Por ello se convierte la salida a UTF-8.\n"
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2547,7 +2574,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2560,12 +2587,12 @@ msgstr ""
 "La salida de '%s' podría ser incorrecta.\n"
 "Las posibles alternativas son:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Poner LC_ALL como local con la codificación %s.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2576,7 +2603,7 @@ msgstr ""
 "  y luego aplicar '%s',\n"
 "  y luego reconvertirlo a %s utilizando 'msgconv'.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2589,7 +2616,7 @@ msgstr ""
 "  y luego aplicar '%s',\n"
 "  y luego reconvertirlo a %s utilizando 'msgconv'.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2601,26 +2628,26 @@ msgstr ""
 "La salida de '%s' podría ser incorrecta.\n"
 "Una alternativa posible s poner LC_ALL=C.\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "la expresión plural puede producir resultados negativos"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu pero las expresiones plurales pueden producir valores tan "
 "grades como %lu"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "la expresión plural puede producir una división por cero"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "la expresión plural puede producir un sobreflujo entero"
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2628,54 +2655,54 @@ msgstr ""
 "la expresión plural puede producir excepciones aritméticas, posiblemente una "
 "división por cero"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Pruebe utilizando lo siguiente, válido para %s:\n"
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "el catálogo de mensajes tiene formas plurales en las traducciones..."
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "... pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "... pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "valor inválido de nplurals"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "expresión plural inválida"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu ..."
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "... pero algunos mensajes sólo tienen solo una forma plural"
 msgstr[1] "... pero algunos mensajes sólo tienen %lu formas plurales"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "... pero algunos mensajes tienen solo una forma plural"
 msgstr[1] "... pero algunos mensajes tienen %lu formas plurales"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2699,7 +2726,7 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' inicial"
@@ -2720,7 +2747,7 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
@@ -2742,81 +2769,81 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' inicial"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' final"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr[%u]' les falta el `\\n' final"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' final"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "el manejo del plural es una extensión del gettext de GNU"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr tiene demasiadas marcas de aceleración de teclado '%c'"
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "no existe el campo `%s' en la cabecera\n"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "el campo de encabezado `%s' debe comenzar al principio de la línea\n"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "algunos campos de cabecera aún tienen el valor inicial por omisión\n"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "el campo `%s' aún tiene el valor inicial por omisión\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error al abrir el fichero \"%s\" para lectura"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "El fichero de entrada no contiene una línea de encabezado que especifique el "
 "conjunto de caracteres"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2825,7 +2852,7 @@ msgstr ""
 "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv()\n"
 "no soporta este tipo de conversión."
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2834,8 +2861,8 @@ msgstr ""
 "La conversión de \"%s\" a \"%s\" introduce duplicados: algunos msgid "
 "distintos se vuelven iguales."
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2976,17 +3003,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprime los indicadores de progreso\n"
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "este mensaje debería definir las formas plurales"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "este mensaje no debería definir las formas plurales"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2996,28 +3023,28 @@ msgstr ""
 "incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n"
 
 # Porque no mejor poner simplemente 'fin'? mm++
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " terminado.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s y los nombres de ficheros explícitos son mutuamente excluyentes"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHERO]...\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Convierte el catálogo de mensajes binarios al fichero de estilo Uniforum ."
 "po.\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -3026,14 +3053,14 @@ msgstr ""
 "  -j, --java                  Modo Java: la entrada es una clase de Java \n"
 "                              ResourceBundle\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --csharp                Modo C#: la entrada es un fichero .dll de ."
 "NET\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -3042,7 +3069,7 @@ msgstr ""
 "      --csharp-resources      modo de recursos C#: genera un fichero ."
 "resources de .NET\n"
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -3050,17 +3077,17 @@ msgstr ""
 "      --tcl                   Modo Tcl: la entrada es un fichero .msg tcl/"
 "msgcat\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FICHERO ...                 ficheros .mo de entrada\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Localización del fichero de entrada en modo Java:\n"
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -3071,12 +3098,12 @@ msgstr ""
 "recurso, separado por un guión bajo. La clase se localiza utilizando la\n"
 "variable de entorno CLASSPATH.\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Localización del fichero de entrada en modo C#:\n"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -3086,12 +3113,12 @@ msgstr ""
 "un subdirectorio del directorio especificado cuyo nombre depende de la "
 "configuración local.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Localización del fichero de entrada en modo Tcl:\n"
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -3100,18 +3127,18 @@ msgstr ""
 "Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 "  -i, --indent                escribe el fichero .po utilizando sangrías\n"
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3134,12 +3161,12 @@ msgstr ""
 "ficheros serán acumuladas. Cuando se utiliza la opción --unique, los \n"
 "duplicados se descartan.\n"
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              muestra únicamente los duplicados\n"
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3149,12 +3176,12 @@ msgstr ""
 "a\n"
 "                                  los duplicados\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -3164,7 +3191,7 @@ msgstr ""
 "La conversión de mensajes al conjunto de caracteres del usuario podría no "
 "funcionar.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3173,7 +3200,7 @@ msgstr ""
 "El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv(),\n"
 "e iconv() no soporta \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3181,15 +3208,15 @@ msgstr ""
 "Instalando GNU libiconv y luego reinstalando GNU gettext\n"
 "podría arreglar este problema.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Se continúa de todas formas, aunque habrá errores de parseo."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Se continúa de todas formas."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3198,7 +3225,7 @@ msgstr ""
 "El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv().\n"
 "Esta versión fue construida sin iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3207,32 +3234,32 @@ msgstr ""
 "La conversión de mensajes al conjunto de caracteres del usuario no "
 "funcionará.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso inconsistente de #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "no hay sección `msgstr'"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "no hay sección `msgstr'"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "no hay sección `msgstr'"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "la primera forma del plural tiene un índice distinto a cero"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "la primera forma del plural tiene un índice incorrecto"
@@ -3270,51 +3297,51 @@ msgstr "la primera forma del plural tiene un 
 # 20071996sv: Eso no seguiría la regla implícita de que el programa no debe
 # hablar en primera persona sino en estilo impersonal.
 # (Esta regla estará en el manual de Enrique, con toda seguridad).
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "demasiados errores, programa interrumpido"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "sucesión de multibyte inválida"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sucesión de multibyte inválida al final del fichero"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sucesión de multibyte inválida al final de la línea"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr "fallo en iconv"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palabra clave \"%s\" desconocida"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "secuencia de control ilegal"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "fin de fichero dentro de una cadena"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "fin de línea dentro de una cadena"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
@@ -3350,75 +3377,75 @@ msgstr ""
 # mente el verbo poder en Castellano es mucho más flexible que en otros
 # idiomas. De todas maneras siempre se puede mirar otras traducciones.  em
 # ok. Acepto en 'no puede' a reserva de encontrar nuevos argumentos. mm
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este fichero no puede contener instrucciones de dominio"
 
 # Nota: es la definición la que está duplicada.
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "definición del mensaje duplicada"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...aquí está la primera definición"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "el fichero \"%s\" está truncado"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "el fichero \"%s\" no está en el formato .mo de GNU"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL en %s"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%lu: atención: \\uxxxx sintáxis no válida para carácter Unicode"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: atención: cadena no finalizada"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s%lu: atención: error de sintáxis"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%lu: atención: par llave/valor no finalizado"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr ""
 "%s:%lu: atención: error de sintáxis, se espera un ';' después de la cadena"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
 "%s:%lu: atención: error de sintáxis, se espera un '=' o un ';' después de la "
 "cadena"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Escrito por %s.\n"
@@ -3427,43 +3454,43 @@ msgstr "Escrito por %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error al abrir el fichero \"%s\" para lectura"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr "se esperan dos argumentos"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Modo de empleo: %s [OPCIÓN] URL FICHEROENTRADA\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3472,12 +3499,12 @@ msgstr ""
 "Trae y muestra el contenido de una URL. Si la URL no puede ser accesada,\n"
 "se utiliza el FICHERO local.\n"
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr "error al escribir la salida estándar"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3486,7 +3513,7 @@ msgstr ""
 "No se pueden mostrar varios dominios de traducción en un sólo fichero en la\n"
 "sintáxis .properties de Java. Intente usar la sintáxis de los ficheros PO."
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3495,7 +3522,7 @@ msgstr ""
 "No se pueden mostrar varios dominios de traducción en un sólo fichero en la\n"
 "sintáxis .strings de NeXTstep/GNUstep."
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
@@ -3504,7 +3531,7 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el "
 "catálogo de mensajes no admite el trato plural"
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3514,7 +3541,7 @@ msgstr ""
 "de salida no lo soporta. Se puede intentar generar una clase Java utilizando "
 "\"msgfmt --java\" en vez del fichero de propiedades."
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3522,61 +3549,53 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el "
 "catálogo de mensajes no admite el trato plural"
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "no se puede crear el fichero de salida \"%s\""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "salida estándar"
 
-#: src/write-csharp.c:618
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
-"formato de los recursos de C# no tiene implementado el trato plural\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "fallo al crear el directorio \"%s\""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "fallo en la compilación de la clase C#, intente --verbose"
 
-#: src/write-java.c:920
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
-"formato de los recursos de C# no tiene implementado el trato plural\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "fallo en la compilación de la clase C#, intente --verbose"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "no es un nombre de clase Java válido: %s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "fallo en la compilación de la clase Java, intente --verbose o poner $JAVAC"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"fallo en la compilación de la clase Java, intente --verbose o poner $JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error al abrir el fichero \"%s\" para escritura"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3584,7 +3603,7 @@ msgstr ""
 "Los mensajes internacionalizados no deben contener la secuencia de escape `\\"
 "%c'"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3597,7 +3616,7 @@ msgstr ""
 "caracteres diferente a la suya. Considere la opción de utilizar un msgid\n"
 "en ASCII puro. %s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3610,7 +3629,7 @@ msgstr ""
 "caracteres diferente a la suya. Considere la opción de utilizar un msgid\n"
 "en ASCII puro. %s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3618,7 +3637,7 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
 "catálogo de mensajes de Qt no soporta el trato plural\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 #, fuzzy
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
@@ -3631,7 +3650,7 @@ msgstr ""
 "admite Unicode sólo en las cadenas traducidas, pero no en las que aún\n"
 "no lo están\n"
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3642,12 +3661,12 @@ msgstr ""
 "admite Unicode sólo en las cadenas traducidas, pero no en las que aún\n"
 "no lo están\n"
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "hubo un error al escribir al subproceso %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3656,7 +3675,7 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
 "formato de los recursos de C# no tiene implementado el trato plural\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3664,7 +3683,7 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
 "formato de los recursos de C# no tiene implementado el trato plural\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3673,7 +3692,7 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
 "catálogo de mensajes de Tcl no soporta el trato plural\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3681,27 +3700,27 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
 "catálogo de mensajes de Tcl no soporta el trato plural\n"
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: atención: cadena no finalizada"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: atención: expresión regular no finalizada"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: atención: literal de cadena no finalizada"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3710,7 +3729,7 @@ msgstr ""
 "Hay una cadena que no está en ASCII en %s%s.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3719,7 +3738,7 @@ msgstr ""
 "%s:%d: Secuencia multibyte inválida.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3728,7 +3747,7 @@ msgstr ""
 "%s:%d: Secuencia multibyte larga incompleta.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3737,7 +3756,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3746,12 +3765,12 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: fallo en iconv"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3760,32 +3779,32 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte inválida.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: atención: carácter Unicode inválido"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: atención: cadena constante no finalizada"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: cuidado: se encontró un ')' en donde se esperaba un '}'"
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: cuidado: se encontró un '}' en donde se esperaba un ')'"
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3794,6 +3813,11 @@ msgstr ""
 "El lenguaje \"glade\" no está soportado. %s se basa en expat.\n"
 "Esta versión fue construida sin expat.\n"
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: atención: cadena no finalizada"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3801,37 +3825,37 @@ msgstr ""
 "%s:%d: no se puede encontrar el terminador de cadena \"%s\" en ningún lugar "
 "antes del fin del fichero"
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: falta una llave derecha en \\x{NÚMEROHEX}"
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolación no válida (\"\\l\") del caracter de 8 bits \"%c\""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolación no válida (\"\\u\") del caracter de 8 bits \"%c\""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: interpolación de variable no válida en \"%c\""
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s%d: interpolación no válida (\"\\L\") del caracter de 8 bits \"%c\""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolación no válida (\"\\U\") del caracter de 8 bits \"%c\""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, fuzzy, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3841,7 +3865,7 @@ msgstr ""
 "Hay una cadena que no está en ASCII en %s%s.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3851,7 +3875,7 @@ msgstr ""
 "%s:%d: Secuencia multibyte inválida.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3861,7 +3885,7 @@ msgstr ""
 "%s:%d: Secuencia multibyte larga incompleta.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3871,7 +3895,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3881,7 +3905,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3891,27 +3915,27 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte inválida.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definición de cadena inválida"
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: falta un número después del símbolo #"
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expresión de cadena inválida"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3920,32 +3944,32 @@ msgstr ""
 "%s:%lu: cuidado: la sintáxis $\"...\" se desaconseja debido a cuestiones de "
 "seguiridad; mejor utilice eval_gettext"
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "no se puede utilizar --join-existing cuando el resultado se escribe en la\n"
 "salida estándar (stdout)"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext no puede funcionar sin palabras claves que buscar"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "atención: el fichero `%s' con extensión `%s'\n"
 "es desconocido; se intentará tipo C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3954,13 +3978,13 @@ msgstr ""
 "  -d, --default-domain=NOMBRE   utiliza NOMBRE.po para la salida (en vez de\n"
 "                                mensajes.po)\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FICHERO        escribe la salida al fichero especificado\n"
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3969,12 +3993,12 @@ msgstr ""
 "                              directorio DIR\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Selección del lenguaje del fichero de entrada:\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3994,12 +4018,12 @@ msgstr ""
 "PHP,\n"
 "                                  fuente-GCC, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abreviatura de --language=C++\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4008,7 +4032,7 @@ msgstr ""
 "Por omisión, el lenguaje se adivina dependiendo de la extensión del fichero "
 "de entrada.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4017,25 +4041,25 @@ msgstr ""
 "      --from-code=NOMBRE      codifica a partir de los ficheros de entrada\n"
 "                                (excepto para Python, Tcl y Glade)\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Por omisión, los ficheros de entrada se presupone que están en ASCII.\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         une los mensajes con un fichero existente\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FICHERO.po  las líneas del FICHERO.po no son extraidas\n"
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -4045,17 +4069,17 @@ msgstr ""
 "                                 aquellas líneas que preceden a la palabra\n"
 "                                 clave) en el fichero de salida\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opciones específicas del lenguaje:\n"
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrae todas las cadenas\n"
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4069,7 +4093,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, fuente-GCC, Glade)\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -4081,7 +4105,7 @@ msgstr ""
 "utilizar \n"
 "                               las palabras clave por omisión)\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4094,7 +4118,7 @@ msgstr ""
 "palabra\n"
 "                                  clave PALABRA\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4108,35 +4132,40 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, fuente-GCC)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs              entiende los trígrafos de ANSI C para la\n"
 "                               entrada\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (sólo en lenguajes C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (sólo lenguaje C++)\n"
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
+
+#: src/xgettext.c:863
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4144,18 +4173,18 @@ msgstr ""
 "      --debug                  muestra con más detalle el reconocimiento\n"
 "                               de las cadenas de formato\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     escribe un fichero .properties de Java\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=CADENA  pone al dueño del copyright en la salida\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4163,7 +4192,18 @@ msgstr ""
 "      --foreign-user          omite el copyright de la FSF en la salida\n"
 "                              para los usuarios extranjeros\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+"      --copyright-holder=CADENA  pone al dueño del copyright en la salida\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4171,7 +4211,7 @@ msgstr ""
 "      --msgid-bugs-address=DIRECCION@DECORREO  pone la dirección de correo \n"
 "                                               para reportar los errores\n"
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -4181,7 +4221,7 @@ msgstr ""
 "las\n"
 "                                  líneas del msgstr\n"
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -4191,7 +4231,7 @@ msgstr ""
 "las\n"
 "                                líneas del msgstr\n"
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -4200,16 +4240,16 @@ msgstr ""
 "Un argumento --flag no tiene la sintáxis ::[pass-]"
 ": %s"
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: atención: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4218,7 +4258,7 @@ msgstr ""
 "Aunque se utilizó en una posición de formato de cadena, el %s no se un "
 "formato de cadena válido %s. La razón es: %s\n"
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -4227,7 +4267,7 @@ msgstr ""
 "Aunque así esté declarado, '%s' no es un formato de cadena válido %s. Razón: "
 "%s\n"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4236,7 +4276,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4246,27 +4286,27 @@ msgstr ""
 "gettext(\"\") regresa la línea de encabezado con la\n"
 "metainformación, no una cadena vacía.\n"
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "el argumento %s es ambiguo para %s"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4278,15 +4318,48 @@ msgstr ""
 "allí la variable MSGID_BUGS_ADDRESS; si no lo hace,\n"
 "debe se poner la opción --msgid-bugs-address\n"
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "idioma `%s' desconocido"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Referencias múltiples a %%%c."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Esto es software libre; vea el código fuente para las condiciones de "
+#~ "copia.\n"
+#~ "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA "
+#~ "UN\n"
+#~ "FIN DETERMINADO.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
+#~ "formato de los recursos de C# no tiene implementado el trato plural\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
+#~ "formato de los recursos de C# no tiene implementado el trato plural\n"
+
 #~ msgid "The %%J directive is only allowed at the beginning of the string."
 #~ msgstr "La instrucción %%J sólo se permite al principio de la cadena."
 
diff --git a/gettext-tools/po/et.po b/gettext-tools/po/et.po
index f8557ead8..56e0be1c2 100644
--- a/gettext-tools/po/et.po
+++ b/gettext-tools/po/et.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2001-04-30 16:25+0200\n"
 "Last-Translator: Ivar Smolin \n"
 "Language-Team: Estonian \n"
@@ -14,87 +14,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -103,119 +104,119 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemne viga"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: võti `%s' on mitmetähenduslik\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: võtmel `--%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: võtmel `%c%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: võtme `%s' järel peab olema argument\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: tundmatu võti `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: tundmatu võti `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: lubamatu võti -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: vigane võti -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: võtme järel peab olema argument -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: võti `-W %s' on mitmetähenduslik\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: võtmel `-W %s' ei tohi olla argumente\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "mälu sai otsa"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "ei suuda luua väljundfaili \"%s\""
@@ -239,280 +240,287 @@ msgstr "ei suuda luua v
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -523,216 +531,214 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 "tuple"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 "mapping"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA IGASUGUSE\n"
-"GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDI GARANTIITA või SOBIVUSELE\n"
-"TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku\n"
-"Litsentsi.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Selle programmi on kirjutanud %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "liiga palju argumente"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Täiendava info saamiseks proovi `%s --help'.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -740,339 +746,344 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 #, fuzzy
 msgid "Report bugs to .\n"
 msgstr "Vigadest teata aadressile .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "vaja läheb täpselt kahte sisendfaili"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ja %s on vastastikku välistavad"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "sisendfail on määramata"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1093,31 +1104,31 @@ msgstr ""
 "  -V, --version            väljastab versiooniinfo ja lõpetab programmi töö\n"
 "  -w, --width=NUMBER       määrab väljastatava lehekülje laiuse\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1145,51 +1156,51 @@ msgstr ""
 "comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n"
 "Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1197,39 +1208,53 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "sisendfailid on määramata"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "vaja läheb täpselt kahte sisendfaili"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1255,81 +1280,81 @@ msgstr ""
 "teated on tõlgitud. Kui täpseid vasteid ei suudeta leida, kasutatakse parema\n"
 "diagnoosi huvides määratlust 'kahtlane'.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "hoiatus: see teade on kasutamata"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "see teade on kasutusel, kuid kirjeldamata..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...kuid see kirjeldus on sarnane"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "hoiatus: see teade on kasutamata"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "leitud %d tõsine viga"
 msgstr[1] "leitud %d tõsist viga"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "vähemalt kaks faili peab olema ette antud"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1356,74 +1381,74 @@ msgstr ""
 "comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n"
 "Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "sisendfail on määramata"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "vaja läheb täpselt kahte sisendfaili"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1432,22 +1457,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "argumendid on puudu"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1457,67 +1482,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "argumendid on puudu"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "vähemalt kaks faili peab olema ette antud"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1525,210 +1550,210 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d tõlgitud teade"
 msgstr[1] "%d tõlgitud teadet"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d kahtlane tõlge"
 msgstr[1] ", %d kahtlast tõlget"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d tõlkimata teade"
 msgstr[1] ", %d tõlkimata teadet"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1737,48 +1762,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "sisendfail on määramata"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1786,33 +1811,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1820,115 +1845,115 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
 "%*s  hoiatus: charset conversion will not work"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Kooditabel on päises kirjeldamata.\n"
 "Tõlgete teisendamine kasutaja kooditabelisse ei toimi.\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
 "%*s  hoiatus: charset conversion will not work"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena: kasutan eesliidet"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "ignoreerin `domain %s' direktiivi"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "ignoreerin tühja `msgstr' kirjet"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ignoreerin kahtlast `msgstr' kirjet"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: hoiatus: lähtefail sisaldab kahtlast tõlget"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1968,30 +1993,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1999,24 +2024,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2024,54 +2049,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2083,54 +2108,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: hoiatus: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2139,7 +2164,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2148,7 +2173,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2157,12 +2182,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2170,7 +2195,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2179,7 +2204,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2187,157 +2212,157 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgst_plural' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgstr[%u]' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgstr' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgst_plural' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgstr[%u]' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgstr' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "päise kirjest on puudu väli `%s'"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "päise kirjes peab väli `%s' algama rea algusest"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "mõned päise kirjes olevad väljad sisaldavad ikka veel algseid väärtusi"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "väli `%s' sisaldab ikka veel algset väärtust"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2346,15 +2371,15 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt ja iconv() ei toeta \"%s\".\n"
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2479,17 +2504,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2498,61 +2523,61 @@ msgstr ""
 "%sLoetud %ld vana + %ld viidet, ühendatud %ld, kahtlaseid %ld, puuduvaid %"
 "ld, vananenuid %ld.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " valmis.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s ja %s on vastastikku välistavad"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2560,41 +2585,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "sisendfail on määramata"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2607,24 +2632,24 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2633,7 +2658,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole portaabel kodeerimise nimetus.\n"
 "Teadete tõlkimine kasutaja kooditabeli järgi võib mitte toimida.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2642,7 +2667,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt ja iconv() ei toeta \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2651,15 +2676,15 @@ msgstr ""
 "GNU libiconv tarkvara ja peale seda teha uus paigaldus tarkvarapakile\n"
 "GNU gettext\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Jätkan siiski, vaatamate parsimisvigadele."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Jätkan siiski."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2668,7 +2693,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2676,150 +2701,150 @@ msgstr ""
 "Kooditabel on päises kirjeldamata.\n"
 "Tõlgete teisendamine kasutaja kooditabelisse ei toimi.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "vastuoluline #~ kasutamine"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "puudub `msgstr[]' sektsioon"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "puudub `msgid_plural' sektsioon"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "puudub `msgstr' sektsioon"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "esimene mitmuse vormi indeks erineb nullist"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "mitmuse vorm omab vale indeksit"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "liiga palju vigu, katkestan töö"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "tundmatu võtmesõna: \"%s\""
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "vigane juhtjada"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "Ootamatu faili lõpp (fail lõppeb poole stringi pealt)"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "reavahetus asub stringi sees"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "see fail ei tohi sisaldada domeeni direktiive"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "teade on kirjeldatud kaks korda"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...see on esimese kirjelduse asukoht"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "faili \"%s\" sai kärbitud"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fail \"%s\" ei ole GNU .mo vormingus"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%d: lõpetamata sümbolkonstant"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Selle programmi on kirjutanud %s.\n"
@@ -2828,139 +2853,136 @@ msgstr "Selle programmi on kirjutanud %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "liiga palju argumente"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "standardväljund"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "tõlgitud teated peaksid mitte sisaldama `\\%c' erimärgijada"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2969,7 +2991,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2978,13 +3000,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -2992,135 +3014,135 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: lõpetamata sümbolkonstant"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: lõpetamata sümbolkonstant"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3129,42 +3151,47 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: hoiatus: lõpetamata string"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: vigane võti -- %c\n"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3172,7 +3199,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3180,7 +3207,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3188,7 +3215,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3196,7 +3223,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3204,7 +3231,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3212,79 +3239,79 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "võtit `--join-existing' ei ole võimalik pruukida kui väljunit kirjutatakse "
 "standardväljundisse"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ei tööta ilma vajalike võtmesõnadeta"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "hoiatus: faili `%s' laiend `%s' on tundmatu; proovin C vormingut"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "sisendfail on määramata"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3296,58 +3323,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3356,14 +3383,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3371,7 +3398,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3380,104 +3407,119 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "standardsisend"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: hoiatus: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3486,34 +3528,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3521,15 +3563,29 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "tundmatu keel `%s'"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA "
+#~ "IGASUGUSE\n"
+#~ "GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDI GARANTIITA või SOBIVUSELE\n"
+#~ "TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku\n"
+#~ "Litsentsi.\n"
+
 #~ msgid "%s: warning: "
 #~ msgstr "%s: hoiatus: "
 
diff --git a/gettext-tools/po/eu.po b/gettext-tools/po/eu.po
index 3d5b758af..a740c8735 100644
--- a/gettext-tools/po/eu.po
+++ b/gettext-tools/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-05-15 02:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-08-31 11:36+0200\n"
 "Last-Translator: Piarres Beobide \n"
 "Language-Team: Basque \n"
@@ -17,88 +17,88 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "%s argumentu baliogabea %s-rentzat"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "%s argumentu anbiguoa %s-rentzat"
 
-#: gnulib-lib/argmatch.c:154
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Argumentu erabilgarria:"
 
-#: gnulib-lib/clean-temp.c:334
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ezin da aldiroko direktorioa aurkitu, saiatu $TMPDIR ezartzen"
 
-#: gnulib-lib/clean-temp.c:348
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ezin da \"%s\" txantiloia erabiliaz aldiroko direktorioa sortu"
 
-#: gnulib-lib/clean-temp.c:444
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ezin da aldiroko %s fitxategia ezabatu"
 
-#: gnulib-lib/clean-temp.c:459
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ezin da aldiroko %s direktorioa ezabatu"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "idazketa errorea"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:55 src/msggrep.c:245
-#: src/open-catalog.c:122 src/read-mo.c:253 src/read-tcl.c:125
-#: src/urlget.c:201 src/xgettext.c:1750 src/xgettext.c:1763
-#: src/xgettext.c:1773
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "errorea \"%s\" irakurketarako irekitzerakoan"
 
-#: gnulib-lib/copy-file.c:74
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "ezin da \"%s\" babeskopia fitxategia idazketarako ireki"
 
-#: gnulib-lib/copy-file.c:82 src/urlget.c:213
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
 
-#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:92
-#: gnulib-lib/copy-file.c:131
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "errorea \"%s\" idaztean"
 
-#: gnulib-lib/copy-file.c:94 gnulib-lib/copy-file.c:133 src/urlget.c:223
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "errorea \"%s\" irakurri ondoren"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:840
-#: src/msginit.c:908 src/msginit.c:1068 src/msginit.c:1151
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() -ek huts egin du"
 
-#: gnulib-lib/csharpcomp.c:540
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Ez da C# konpiladorerik aurkitu, saiatu pnet instalatuaz"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Ez da C# makina birtualik aurkitu, saiatu pnet instalatuaz"
@@ -107,122 +107,122 @@ msgstr "Ez da C# makina birtualik aurkitu, saiatu pnet instalatuaz"
 msgid "Unknown system error"
 msgstr "Sistema errore ezezaguna"
 
-#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:261 gnulib-lib/execute.c:303
-#: gnulib-lib/pipe.c:230 gnulib-lib/pipe.c:348 gnulib-lib/pipe.c:408
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s azpirpozesuak huts egin du"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s' aukera anbiguoa da\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: `--%s' aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: `--%s' aukera ezezaguna\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: `%c%s' aukera ezezaguna\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: legezkanpoko aukera -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: aukera baliogabea -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: -- %c aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' aukera anbiguoa da\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/javacomp.c:128 gnulib-lib/javacomp.c:142
-#: gnulib-lib/javacomp.c:158
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "source_version argumentu baliogabea compile_java_class-rentzat"
 
-#: gnulib-lib/javacomp.c:173 gnulib-lib/javacomp.c:194
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "target_version argumentu baliogabea compile_java_class-rentzat"
 
-#: gnulib-lib/javacomp.c:505 src/write-csharp.c:714 src/write-java.c:988
-#: src/write-java.c:1000
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Huts \"%s\" sortzerakoan"
 
-#: gnulib-lib/javacomp.c:512 src/write-catalog.c:254 src/write-catalog.c:318
-#: src/write-csharp.c:723 src/write-java.c:1009 src/write-mo.c:812
-#: src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errorea \"%s\" fitxategia idazterakoan"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "ez da java konpiladorerik aurkitu, saiatu gcj instalatuaz edo $JAVAC ezarriaz"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "ez da java makina birtualik aurkitu, saiatu gcj instalatuaz edo $JAVAC "
 "ezarriaz"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:848 src/msginit.c:916
-#: src/msginit.c:1076
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s azpiprozesu S/I errorea"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:39 src/msgl-check.c:452 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:436 libgettextpo/gettext-po.c:1245
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria askieza"
 
-#: gnulib-lib/pipe.c:156 gnulib-lib/pipe.c:159 gnulib-lib/pipe.c:263
-#: gnulib-lib/pipe.c:266
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "ezin da tutua sortu"
@@ -246,73 +246,73 @@ msgstr "ezin da tutua sortu"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:230
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandle-ek 0x%08x errore kodeaz huts egin du"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle -ek huts egin du"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s azpiprozesua"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s azpiprozesua %d seinale konponezina jaso du"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr "'%s' ez da baliozko %s formatu katea, ez 'msgid' bezala. Arrazoia: %s"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:624 src/format-librep.c:313
-#: src/format-pascal.c:402 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:138 src/format-tcl.c:391 src/format-ycp.c:145
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr ""
 
-#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:634 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
-#: src/format-qt.c:137 src/format-tcl.c:401 src/format-ycp.c:144
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "%u argumentuaren formatu espezifikazioa ez dago  '%s'-en"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:911
-#: src/format-elisp.c:379 src/format-gcc-internal.c:654
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
-#: src/format-php.c:381 src/format-python.c:511 src/format-tcl.c:421
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr ""
 "'msgid' eta '%s' formatu ezarpenak ez dira berdina %u argumentuarentzat"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "%u direktiba | -rekin hasten da baina ez | -rekin amaitzen."
 
-#: src/format-c.c:182
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -322,75 +322,75 @@ msgstr ""
 "makro izena. Baliozko makro izenak  ISO C 99 7.8.1. atalean daude "
 "zerrendaturik."
 
-#: src/format-c.c:589
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "%u zenbakiko direktiban, '<' ondorengo elementua ez dago '>'-rekin jarraitua."
 
-#: src/format-c.c:815
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Kateak %u argumentuaz ari da baina %u argumentu zenbakia alde batetara uzten "
 "du."
 
-#: src/format-c.c:902 src/format-csharp.c:207 src/format-python.c:502
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "'msgid' eta '%s' -ren formatu espezifikazio zenbakiak ez dira berdinak"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 "%u zenbakidun direktiban, '{' ez dago argumentu zenbaki batez jarraitua."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "%u zenbakidun direktiban, ',' ez dago zenbaki batez jarraitua."
 
-#: src/format-csharp.c:131 src/format-java.c:192
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "Katea direktiba erdian amaitzen da: '{' aurkitu da pareko '}' gabe."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 "%u zenbakidun direktiba '%c' karaktere baliogabeaz amaitzen da '}'-ren ordez."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 "%u zenbakidun direktiba karaktere baliogabe batez amaitzen da '}'-ren ordez."
 
-#: src/format-csharp.c:162 src/format-java.c:347
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr "KAtea direktiba erdian hasten da: '}' topatu da pareko '{'-rik gabe."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:254
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "%u direktiban, bandera nahastea ez da zuzena."
 
-#: src/format-gcc-internal.c:291 src/format-gcc-internal.c:397
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "%u zenbakidun direktiban, zehatapena ez da onartze '%c' ondoren"
 
-#: src/format-gcc-internal.c:333
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -399,37 +399,44 @@ msgstr ""
 "%u zenbakidun direktiban, zehaztapenaren argumentu zenbakia %u-ren berdina "
 "izan behar da."
 
-#: src/format-gcc-internal.c:405
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "%u zenbakidun direktiban, zehatapena ez da onartze '%c' ondoren"
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "%u zenbakidun direktiban, zehaztepen ezapena baliogabea da."
 
-#: src/format-gcc-internal.c:460
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "%u zenbakidun direktiban, banderak ez dira onartzen '%c' ondoren."
 
-#: src/format-gcc-internal.c:672
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "'msgid'-ek %%m erabiltzen du baina '%s'-ek ez"
 
-#: src/format-gcc-internal.c:675
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "'msgid'-ek ez du %%m erabiltzen baina '%s'-ek %%m erabiltzen du"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Katea direktibaren erdian amaitzen da."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
@@ -437,7 +444,7 @@ msgstr ""
 "%u zenbakidun direktiban, 0 zenbakidun argumentua ez da zenbaki oso positibo "
 "bat."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
@@ -446,7 +453,7 @@ msgstr ""
 "%u zenbakidun direktiban, 0 zenbakidun argumentu zabalera ez da zenbaki oso "
 "positibo bat."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
@@ -455,7 +462,7 @@ msgstr ""
 "%u zenbakidun direktiban, zehaztasunaren 0 zenbakidun argumentu  ez da "
 "zenbaki oso positibo bat."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
@@ -464,7 +471,7 @@ msgstr ""
 "%u zenbakidun direktiban, '%c' karakterea ez da baliozko bihurketa "
 "espezifikatzailea."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -473,14 +480,14 @@ msgstr ""
 "%u zenbakidun direktiban amaitzen duren karakterea ez da baliozko bihurketa "
 "espezifikatzailea."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 "Kateak %u zenbakidun argumetua erreferentzaitzen du modu ez bateragari "
 "batetan."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -488,12 +495,12 @@ msgid ""
 msgstr ""
 "%u zenbakidun direktiban, \"%s\" azpikatea ez da baiozko data/ordu estilokoa."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "%u zenbakidun direktiban, \"%s\" ez dago gako batez jarraitua."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
@@ -501,7 +508,7 @@ msgstr ""
 "%u zenbakidun direktiban , \"%s\" azpi-katea ez da baliozko estilo zenbaki "
 "bat."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -510,12 +517,12 @@ msgstr ""
 "%u zenbakidun direktiban, argumentu zenbakia ez dago gako batez eta \"%s\", "
 "\"%s\", \"%s\"edo \"%s\" batez jarraitua."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "%u zenbakidun direktiban, hautapen batek ez du zenbakirik."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -524,33 +531,33 @@ msgstr ""
 "%u zenbakidun direktiban, hautapen batek  '<', '#' edo '%s'-ek jarraitzen ez "
 "duen zenbaki bat du."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "a formateatu - u in s t in"
 
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "a formateatu - u t in s"
 
-#: src/format-java.c:776
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "formateatu in eta s - u"
 
-#: src/format-lisp.c:2338 src/format-lisp.c:2350 src/format-scheme.c:2364
-#: src/format-scheme.c:2376
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr "Handiagotu u u da - mota s a - mota s da."
 
-#: src/format-lisp.c:2373 src/format-scheme.c:2399
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -561,174 +568,174 @@ msgid_plural ""
 msgstr[0] "Handiagotu u u."
 msgstr[1] "Handiagotu u u."
 
-#: src/format-lisp.c:2497 src/format-scheme.c:2500
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "Handiagotu u k da Bielorrusiarra a."
 
-#: src/format-lisp.c:2737 src/format-scheme.c:2755
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, fuzzy, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "Handiagotu u l da."
 
-#: src/format-lisp.c:2806
+#: src/format-lisp.c:2805
 #, fuzzy
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "katea in - a."
 
-#: src/format-lisp.c:2844 src/format-lisp.c:3109 src/format-lisp.c:3226
-#: src/format-lisp.c:3286 src/format-lisp.c:3398 src/format-scheme.c:2841
-#: src/format-scheme.c:3106 src/format-scheme.c:3223 src/format-scheme.c:3321
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, fuzzy, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "k k."
 
-#: src/format-lisp.c:2864 src/format-scheme.c:2861
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, fuzzy, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "Handiagotu u eta."
 
-#: src/format-lisp.c:2977 src/format-scheme.c:2974
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr "Handiagotu u da Bielorrusiarra bikoa Bielorrusiarra."
 
-#: src/format-lisp.c:3327 src/format-scheme.c:3264
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, fuzzy, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "Handiagotu u da in baliogabea."
 
-#: src/format-lisp.c:3433 src/format-scheme.c:3356
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 #, fuzzy
 msgid "The string refers to some argument in incompatible ways."
 msgstr "katea nori in."
 
-#: src/format-lisp.c:3475 src/format-scheme.c:3398
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "formateatu in eta s"
 
-#: src/format-lisp.c:3491 src/format-scheme.c:3414
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "formateatu in s a - in"
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr "Handiagotu u tamaina da honekin k."
 
-#: src/format-perl-brace.c:200 src/format-python.c:460 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "a formateatu - s t in s"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 #, fuzzy
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr "katea nori eta izengabe."
 
-#: src/format-python.c:344
+#: src/format-python.c:343
 #, fuzzy, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "katea nori s in."
 
-#: src/format-python.c:420
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 "tuple"
 msgstr "formateatu in a in s a"
 
-#: src/format-python.c:427
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 "mapping"
 msgstr "formateatu in a in s a"
 
-#: src/format-python.c:450 src/format-sh.c:298
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "a formateatu - s in s t in"
 
-#: src/format-python.c:480
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "formateatu in eta s - s"
 
-#: src/format-qt.c:81
-#, fuzzy, c-format
-msgid "Multiple references to %%%c."
-msgstr "Anizkoitza nori k."
+#: src/format-qt.c:152
+#, c-format
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 #, fuzzy
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "katea nori a honekin a ASCII."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 #, fuzzy
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr "katea nori a honekin da nori."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 #, fuzzy
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr "katea nori a balioa maiatzak."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 #, fuzzy
 msgid "The string refers to a shell variable with an empty name."
 msgstr "katea nori a honekin hutsik."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr "Handiagotu u k da a eta."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, fuzzy, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr "u da a eta."
 
-#: src/hostname.c:179 src/msgattrib.c:326 src/msgcat.c:282 src/msgcmp.c:162
-#: src/msgcomm.c:269 src/msgconv.c:224 src/msgen.c:212 src/msgexec.c:179
-#: src/msgfilter.c:281 src/msgfmt.c:365 src/msggrep.c:399 src/msginit.c:258
-#: src/msgmerge.c:320 src/msgunfmt.c:251 src/msguniq.c:248
-#: src/recode-sr-latin.c:111 src/urlget.c:131 src/xgettext.c:509
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Hau software librea da; iturburua ikusi kopiatze baldintzetarako.  EZ dago inolako bermerik;\n"
-"ezta EGOKITASUNA MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO.\n"
 
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
 #: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:263
-#: src/msgmerge.c:325 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:514
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s-ek idatzia.\n"
@@ -736,26 +743,26 @@ msgstr "%s-ek idatzia.\n"
 #. This is a proper name. See the gettext manual, section Names.
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
 #: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:263 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
 #: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:273 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "argumentu gehiegi"
 
 #: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
 #: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:347
-#: src/msgmerge.c:446 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:730
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "`%s --help' erabili argibide gehiagorako.\n"
 
-#: src/hostname.c:211 src/msginit.c:351 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Erabilera: %s [AUKERA]\n"
@@ -793,27 +800,27 @@ msgstr "  -i, --ip-address            ostalari izenaren helbidea\n"
 
 #: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
 #: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:403
-#: src/msgmerge.c:563 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:880
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informazio irteera:\n"
 
 #: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
 #: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:405
-#: src/msgmerge.c:565 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:882
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  laguntza hau bisarazi eta irten\n"
 
 #: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
 #: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:407
-#: src/msgmerge.c:567 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:884
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               bertsio argibideak bistarazi eta irten\n"
@@ -824,9 +831,9 @@ msgstr "  -V, --version               bertsio argibideak bistarazi eta irten\n"
 #. bugs (typically your translation team's web or email address).
 #: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
 #: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:414
-#: src/msgmerge.c:578 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:891
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "Programa erroreen berri emateko: .\n"
 
@@ -835,8 +842,8 @@ msgstr "Programa erroreen berri emateko: .\n"
 msgid "could not get host name"
 msgstr "ezind a ostalari izena eskuratu"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:151 src/msgfilter.c:211
-#: src/msggrep.c:419 src/msginit.c:196 src/msguniq.c:268
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "behintzat sarrera fitxategi bat onartu da"
@@ -845,9 +852,10 @@ msgstr "behintzat sarrera fitxategi bat onartu da"
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
 #: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
 #: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:350 src/msgmerge.c:371
-#: src/msgmerge.c:375 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:524 src/xgettext.c:528 src/xgettext.c:535
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s eta %s ez dira bateragarriak"
@@ -868,7 +876,7 @@ msgstr ""
 
 #: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
 #: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:361 src/msgmerge.c:467 src/msgunfmt.c:423
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
@@ -879,8 +887,8 @@ msgstr ""
 
 #: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
 #: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:364 src/msgmerge.c:470
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:748
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "Sarrera fitxategi kokapena:\n"
@@ -892,8 +900,8 @@ msgstr "  SARRERA_FITXATEGIA        sarrera PO fitxatergia\n"
 
 #: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
 #: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:476 src/msguniq.c:336
-#: src/xgettext.c:754
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -911,21 +919,21 @@ msgstr ""
 
 #: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
 #: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:372 src/msgmerge.c:488 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:759
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "Irteera fitxategi kokapena:\n"
 
 #: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
 #: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:490 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FITX      idatzi irteera ezarritako fitxategian\n"
 
 #: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:492
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -1045,14 +1053,14 @@ msgstr ""
 
 #: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
 #: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:380 src/msgmerge.c:525
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sarrera fitxategi sintaxia:\n"
 
 #: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:382 src/msguniq.c:358
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1061,7 +1069,7 @@ msgstr ""
 "dago\n"
 
 #: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:384 src/msguniq.c:360
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1072,15 +1080,15 @@ msgstr ""
 
 #: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
 #: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:387 src/msgmerge.c:533 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:838
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "Irteera xehetasunak:\n"
 
 #: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:535 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:840
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1088,8 +1096,8 @@ msgstr ""
 "  -e, --no-escape             ez erabili C ihesak irteeran (lehenetsia)\n"
 
 #: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:537 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:842
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1098,14 +1106,14 @@ msgstr ""
 "karaktereak\n"
 
 #: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:539
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:844
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              PO fitxategia idatzi nahiz hutsik egon\n"
 
 #: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:846
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
@@ -1113,50 +1121,50 @@ msgstr ""
 "idatzi\n"
 
 #: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:848
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
 #: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:850
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
 #: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:852
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
 #: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:393
-#: src/msgmerge.c:549 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
 #: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:395
-#: src/msgmerge.c:551 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:856
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
 #: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:397
-#: src/msgmerge.c:553 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:858
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ZENBAKIA        irteera orri zabalera ezarri\n"
 
 #: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:399
-#: src/msgmerge.c:555 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:860
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1164,15 +1172,15 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:558 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:863
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ordenatutako irteera sortu\n"
 
 #: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:560 src/msguniq.c:395
-#: src/xgettext.c:865
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          irteera fixattegi kokapenaz ordenatu\n"
@@ -1182,7 +1190,7 @@ msgstr "  -F, --sort-by-file          irteera fixattegi kokapenaz ordenatu\n"
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ezinezko hatapen kriterio bat ezarri da (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:734
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Erabilera: %s [AUKERA] [SARRERA_FITX]...\n"
@@ -1201,12 +1209,12 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:750
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               sarrera fitxategiak\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:752
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
@@ -1214,7 +1222,7 @@ msgstr ""
 "eskuratu\n"
 
 #: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:756
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Sarrera fitxategia - bada, sarrera estandarra irakurriko da.\n"
@@ -1241,7 +1249,7 @@ msgid ""
 msgstr ""
 
 #: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:527
+#: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1250,7 +1258,7 @@ msgstr ""
 "daude\n"
 
 #: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:529
+#: src/msgmerge.c:532
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1286,21 +1294,21 @@ msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:325
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:336
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "ez da sarrera fitxategirik eman"
 
-#: src/msgcmp.c:183 src/msgmerge.c:341
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "zehazki 2 sarrera fitxategi behar dira"
 
-#: src/msgcmp.c:202 src/msgmerge.c:450
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Erabilera: %s [AUKERA] def.po ref.pot\n"
@@ -1326,12 +1334,12 @@ msgstr "  def.po                      itzulpenak\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     iturburura erreferentziak\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:516
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operazio aldagaiak:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:518
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1359,17 +1367,17 @@ msgstr "mezu hau itzuli gabe dago"
 msgid "this message needs to be reviewed by the translator"
 msgstr "mezu hau itzultzaile batek gainbegiratu behar du"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1220
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "mezu hau erabilia baina definitu gabe daago..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1223
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...baina definizio hau oso antzekoa da"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1251
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "mezu hau erabilia dago baina ez dago %s-en ezarria"
@@ -1411,7 +1419,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:867
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1433,19 +1441,19 @@ msgstr "Bihurtze helburua:\n"
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Lehenetsiriko kodeketa uneko lokalaren kodeketa da.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:541
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                kokadun irteera estiloa\n"
 
 #: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:543
+#: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           kendu '#: filename:line' lerroak\n"
 
 #: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:545
+#: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1454,12 +1462,12 @@ msgstr ""
 "(lehenetsia)\n"
 
 #: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:547
+#: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                Uniforum zehatz irteera estiloa\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:552
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "ez da sarrera fitxategirik eman"
@@ -1626,18 +1634,18 @@ msgstr "Huts %s azpiprozesua irakurtzerakoan"
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s azpiprozesua %d irteera kodeaz amaitu da"
 
-#: src/msgfmt.c:303
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:350
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:514
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1693,7 +1701,7 @@ msgstr "Erabilera: %s [AUKERA] fitxategizena.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Testu itzulpen deskribapen batetik mezu katalogo bitar bat sortu.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:743
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1707,7 +1715,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  fitxategizena.po ...             sarrera fitxategiak\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:482 src/msgunfmt.c:426 src/xgettext.c:791
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Funtzionamendu modua:\n"
@@ -1761,7 +1769,7 @@ msgstr "      --qt                    Qt modua: Qt .qm fitxategi bat sortu\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                Uniforum zehatz modua gaitu\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:767
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Irteera fitxategia - bada, irteera irteera estandarrean idatziko da.\n"
@@ -1848,7 +1856,7 @@ msgstr ""
 "direktorioan\n"
 "idatziko da.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:783
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Sarrera fitxategi interpretazioa:\n"
@@ -1919,7 +1927,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            itzulpenaren estatistikak inprimatu\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:569 src/msgunfmt.c:515
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               handitu argibide maila\n"
@@ -1976,13 +1984,13 @@ msgstr "zalantzan dagoen `msgstr' sarrera alde batetara utziko da"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: oharra: jatorri fitxategiak zalantzazko itzulpenak ditu"
 
-#: src/msggrep.c:256 src/po-lex.c:658 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:141
-#: src/x-c.c:416 src/x-csharp.c:160 src/x-elisp.c:147 src/x-glade.c:452
-#: src/x-java.c:173 src/x-librep.c:149 src/x-lisp.c:214 src/x-perl.c:228
-#: src/x-perl.c:303 src/x-perl.c:396 src/x-php.c:164 src/x-python.c:176
-#: src/x-rst.c:235 src/x-scheme.c:173 src/x-sh.c:157 src/x-smalltalk.c:93
-#: src/x-tcl.c:152 src/x-ycp.c:93
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
@@ -2061,7 +2069,7 @@ msgstr "      --sort-output           ordenatutako irteera sortu\n"
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          fitxategi kokapenez ordenatu\n"
 
-#: src/msginit.c:286
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2071,7 +2079,7 @@ msgstr ""
 "ezarri LANG ingurune aldagaia, ABOUT-NLS fitxategian azaltzen\n"
 "den moduan.  HAu beharrezkoa da itzulpenak probatu ahal izateko.\n"
 
-#: src/msginit.c:310
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2082,12 +2090,12 @@ msgstr ""
 "Mesedez ezarri locale-a --locale aukeraren bidez edo irteera\n"
 ".po fitxategia --output-file fitxategiaren bidez.\n"
 
-#: src/msginit.c:336
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s-ek sortua .\n"
 
-#: src/msginit.c:356
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2096,12 +2104,12 @@ msgstr ""
 "PO fitxategi berri bat sortu, meta informazioa erabiltzailearen inguruneko balioez\n"
 "abiarazten.\n"
 
-#: src/msginit.c:366
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=SAR_FITXATEGIA       sarrera POT fitxategia\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2112,26 +2120,26 @@ msgstr ""
 "fitxategiaren bila.\n"
 "berau - bada, sarrera estandarra irakurriko da\n"
 
-#: src/msginit.c:374
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FITXATEGIA      idatzi irteera ezarritako PO "
 "fitxategian\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:389
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          helburu locale-a ezarri\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2139,7 +2147,7 @@ msgstr ""
 "      --no-translator         PO fitxategia automatikoki sortu dela "
 "pentsatu\n"
 
-#: src/msginit.c:451
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2147,12 +2155,12 @@ msgstr ""
 ".pot fitxategi bat baino gehiago topatu da.\n"
 "Mesedez ezarri sarrera .pot fitxategia --input aukeraren bidez.\n"
 
-#: src/msginit.c:459 src/msginit.c:464
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "errorea uneko direkotrioa irakurtzerakoan"
 
-#: src/msginit.c:472
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2160,14 +2168,14 @@ msgstr ""
 "Ez da uneko direkotrioan .pot fitxategirik aurkitu.\n"
 "Mesedez ezarri sarrera .pot fitxategia --input aukeraren bidez.\n"
 
-#: src/msginit.c:861 src/msginit.c:929 src/msginit.c:1089 src/msginit.c:1168
-#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
-#: src/read-tcl.c:127 src/write-resources.c:104
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s azpiprozesuak %d irteera kodeaz huts egin du"
 
-#: src/msginit.c:1054
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2184,47 +2192,47 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1443
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s paketearen Ingelesezko itzulpena"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "dagoen \"%s\" karaktere jokoa ez da kodeketa izen portable bat"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "bi karaktere joko ezberdin \"%s\" eta \"%s\" sarrera fitxategian"
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "`%s' sarrera fitxategiak ez du karaktere joko ezarpena duen goibururik"
 
-#: src/msgl-cat.c:207
+#: src/msgl-cat.c:206
 #, fuzzy, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr "s in s t a goiburua honekin a"
 
-#: src/msgl-cat.c:389 src/msgl-iconv.c:361
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, fuzzy, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "s da a."
 
-#: src/msgl-cat.c:440 src/msgl-cat.c:446 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:2770
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "oharra: "
 
-#: src/msgl-cat.c:441
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2234,7 +2242,7 @@ msgstr ""
 "artean.\n"
 "Irteera UTF-8 -ra bihurtzen.\n"
 
-#: src/msgl-cat.c:447
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2247,7 +2255,7 @@ msgstr ""
 "Irteera UTF-8 -ra bihurtzen.\n"
 "BEste irteera kodeketa bat hautatzeko, --to-code aukera erabili.\n"
 
-#: src/msgl-cat.c:486
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2256,7 +2264,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2269,12 +2277,12 @@ msgstr ""
 "'%s'-ren irteera okerra izan.\n"
 "Aukera posibleak:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- LC_ALL %s kodeketa duen lokal batetara ezarri.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2285,7 +2293,7 @@ msgstr ""
 "  orduan '%s' ezarri,\n"
 "  gero %s 'msgconv' erabiliaz atzera bihurtu.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2298,7 +2306,7 @@ msgstr ""
 "  orduan '%s' ezarri,\n"
 "  gero 'msgconv' erabiliaz %s-ra atzera bihurtu.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2309,26 +2317,26 @@ msgstr ""
 "'%s'-ren irteera okerra izan daiteke.\n"
 "Aukera bat LC_ALL=C ezartzea da.\n"
 
-#: src/msgl-check.c:91
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "espresio pluralek balio negatiboak sortu ditzakete"
 
-#: src/msgl-check.c:101
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu baina plural espresioek %lu baino balio handiagoak sortu "
 "ditzakete"
 
-#: src/msgl-check.c:142
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "espresio pluralek 0-z zatiketak srotu ditzakete"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "espresio pluralek zenbaki oso gainezkatze bat sortu dezakete"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2336,51 +2344,51 @@ msgstr ""
 "espresio pluralek salbuespen aritmetikoak sortu ditzakete, posibleki 0-z "
 "zatiketak"
 
-#: src/msgl-check.c:184
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Hurrengoa erabiliaz saiatu, %s-rentzat baliagarria:"
 
-#: src/msgl-check.c:267 src/msgl-check.c:291
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr "mezu katalogoak plural moduko itzulpenak ditu"
 
-#: src/msgl-check.c:269
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "baina goiburuak ez du \"plural=ESPRESIOA\" atributurik"
 
-#: src/msgl-check.c:293
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "baina goiburuak ez du \"nplurals=ZENBAKI_OSO\" atributurik"
 
-#: src/msgl-check.c:329
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "nplurals balio baliogabea"
 
-#: src/msgl-check.c:351
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "plural espresio baliogabea"
 
-#: src/msgl-check.c:381 src/msgl-check.c:397
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:383
+#: src/msgl-check.c:392
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "baina zenbait mezuk bakarrik forma plural bat dute"
 msgstr[1] "baina zenbait mezuk bakarrik %lu forma plural dituzte"
 
-#: src/msgl-check.c:399
+#: src/msgl-check.c:408
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "baina zenbait mezuk forma plural bat dute"
 msgstr[1] "baina zenbait mezuk %lu forma plural dituzte"
 
-#: src/msgl-check.c:419
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2388,82 +2396,82 @@ msgstr ""
 "mezu katalogoak plural moduko iztuilpenak ditu, baina ez du \"Plural-Forms: "
 "nplurals=INTEGER; plural=EXPRESSION;\" goiburuan"
 
-#: src/msgl-check.c:501
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' eta`msgid_plural' sarrerak ez dira biak honela hasten: '\\n'"
 
-#: src/msgl-check.c:509
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' sarrerak ez dira biak honela hasten: '\\n'"
 
-#: src/msgl-check.c:524
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' eta `msgstr' sarrerak ez dira biak honela hasten: '\\n'"
 
-#: src/msgl-check.c:542
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' eta`msgid_plural' sarrerak ez dira biak honela amaitzen: '\\n'"
 
-#: src/msgl-check.c:550
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' sarrerak ez dira biak honela amaitzen: '\\n'"
 
-#: src/msgl-check.c:565
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' eta `msgstr' sarrerak ez dira biak honela amaitzen: '\\n''"
 
-#: src/msgl-check.c:577
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural kudeaketa GNU gettext hedapen bat da"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:629
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:669
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "`%s' goiburu eremua falta da goiburuan\n"
 
-#: src/msgl-check.c:677
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "`%s' goiburu eremua lerro hasieran hasi behar da\n"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
 
-#: src/msgl-check.c:704
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "`%s' eremuak oraindik hasierako balioa du\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: sarrera ez da baliozkoa \"%s\" kodeketan"
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: errorea \"%s\" kodeketatik \"%s\" kodeketara bihurketa egitean"
 
-#: src/msgl-iconv.c:269
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "sarrera fitxategiak ez du karaktere jokoa ezartzen duen goiburu sarrerarik"
 
-#: src/msgl-iconv.c:291 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:618 src/xgettext.c:610
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2472,15 +2480,15 @@ msgstr ""
 "Ezinda \"%s\"-tik \"%s\"-ra bihurketa egin. %s iconv() funtzioan "
 "oinarriturik dago, eta iconv() -ek ez du bihurketa hau onartzen."
 
-#: src/msgl-iconv.c:321
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:327 src/recode-sr-latin.c:301 src/x-python.c:625
-#: src/xgettext.c:617
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2489,16 +2497,16 @@ msgstr ""
 "Ezinda \"%s\"-tik \"%s\"-ra bihurketa egin. %s iconv() funtzioan "
 "oinarriturik dago. Bertsio hau iconv() gabe erabili zen."
 
-#: src/msgmerge.c:358 src/msgmerge.c:364
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s %s-rekin bakarrik da baliozkoa"
 
-#: src/msgmerge.c:418
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr "babeskopia mota"
 
-#: src/msgmerge.c:455
+#: src/msgmerge.c:458
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2512,24 +2520,24 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:472
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:474
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:478
+#: src/msgmerge.c:481
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:484
+#: src/msgmerge.c:487
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2539,27 +2547,27 @@ msgstr ""
 "                              ez egin ezer def.po dagoeneko eguneraturik "
 "badago\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Irteera fitxategi kokapena eguneraketa moduan:\n"
 
-#: src/msgmerge.c:498
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Emaiztak berriz def.po fitxategian idatziko dira.\n"
 
-#: src/msgmerge.c:500
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        def.po-ren babeskopia bat egin\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=AURRIZKI      gainidatzi babeskopia aurrizki arrunta\n"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:507
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2571,7 +2579,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:511
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2579,41 +2587,41 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:523
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     ez erabili zalantza parekatzea\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:525
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              mantendu aurreko msgid-ak itzulitako mezuetan\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       kendu aurrerapen erakusleak\n"
 
-#: src/msgmerge.c:1324
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "mezu honek plural moduak ezarri behar ditu"
 
-#: src/msgmerge.c:1347
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "uneko"
 
-#: src/msgmerge.c:1685
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:1693
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " eginda.\n"
 
@@ -2742,12 +2750,12 @@ msgstr ""
 "  -u, --unique                mezu bakarrak bakarrik inprimatu, "
 "bikoiztutakoak alboratu\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2756,7 +2764,7 @@ msgstr ""
 "\"%s\" karaktere jokoa ez da kodeketa izen aldagarri bat.\n"
 "Mezu bihurtzeak ez du funtzionatuko erabiltzailearen karaktere jokoarekin.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2766,7 +2774,7 @@ msgstr ""
 "dago,\n"
 "eta iconv() -ek ez du \"%s\" onartzen.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2774,15 +2782,15 @@ msgstr ""
 "GNU libiconv instalatu ondoren GNU gettext berrinstalatzeak\n"
 "arazo hau konpon dezake.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Jarraitu ala ere, analisi erroreak itxoin"
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Jarraitu ala ere."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2791,7 +2799,7 @@ msgstr ""
 "Ez da \"%s\" karaktere jokoa onartzen %s iconv() -en oinarritua dago.\n"
 "Bertsio hau iconv() gabe eraiki zen.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2799,32 +2807,32 @@ msgstr ""
 "Karaktere jokoa falta da goiburuan\n"
 "Erabiltzailearen karaktere jokora mezu bihurketak ez du funtzionatuko.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "#~ -ren erabilera okerra"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "`msgstr[]' atala falta da"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "`msgid_plural' atala falta da"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "`msgstr' atala falta da"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "lehen plural moduak zero ez den indize bat du"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "plural moduak okerreko indize bat du"
@@ -2834,7 +2842,7 @@ msgstr "plural moduak okerreko indize bat du"
 msgid "too many errors, aborting"
 msgstr "errore gehiegi, uzten"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:708 src/write-po.c:833
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "multibyte sekuentzia baliogabea"
@@ -2878,60 +2886,60 @@ msgstr "lerro-amaiera katerik gabe"
 msgid "context separator  within string"
 msgstr "kontestu bereizlea  katerik gabe"
 
-#: src/read-catalog.c:328 src/xgettext.c:903
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "fitxategi honek ez lituzke domeinu direktibak izan beharko"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "bikoizturiko mezu definizioa"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "hau da lehen definizioaren kokalekua"
 
-#: src/read-mo.c:106 src/read-mo.c:127 src/read-mo.c:173 src/read-mo.c:200
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" fixtategia hondaturik dago"
 
-#: src/read-mo.c:130
+#: src/read-mo.c:129
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "s hau duena a katea"
 
-#: src/read-mo.c:166 src/read-mo.c:275
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" fitxategia ez da GNU .mo formatukoa"
 
-#: src/read-mo.c:179
+#: src/read-mo.c:178
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "s hau duena a katea s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "warning: \\uxxxx sintasi baliogabe Unicode karaktereentzat"
 
-#: src/read-stringtable.c:803
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "oharra: amaitugabeko katea"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "oharra: sintasi errorea"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "oharra: amaitugabeko kate/balio parea"
 
-#: src/read-stringtable.c:940
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr "oharra: sintasi errorea, ';' espero zen katearen ondoren"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "oharra: sintasi errorea, '=' edo ';' espero zen katearen ondoren"
 
@@ -2996,28 +3004,28 @@ msgstr ""
 msgid "error writing stdout"
 msgstr "errorea irteera estandarrean idazterakoan"
 
-#: src/write-catalog.c:127
+#: src/write-catalog.c:126
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr "a single honekin formateatu horren ordez."
 
-#: src/write-catalog.c:130
+#: src/write-catalog.c:129
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr "a single honekin formateatu."
 
-#: src/write-catalog.c:163
+#: src/write-catalog.c:162
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr "formateatu."
 
-#: src/write-catalog.c:198
+#: src/write-catalog.c:197
 #, fuzzy
 msgid ""
 "message catalog has plural form translations, but the output format does not "
@@ -3025,7 +3033,7 @@ msgid ""
 "of a properties file."
 msgstr "formateatu a Java horren ordez - a."
 
-#: src/write-catalog.c:203
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3033,65 +3041,61 @@ msgstr ""
 "mezu katalogoak itzulpen pluralak ditu, baina irteera formatuak ez ditu "
 "onartzen."
 
-#: src/write-catalog.c:230 src/write-catalog.c:274
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ezin da \"%s\" irteera fitxategia sortu"
 
-#: src/write-catalog.c:238 src/write-catalog.c:282
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "irteera estandarra"
 
-#: src/write-csharp.c:611
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"mezu katalogoak testuinguruarekiko dependentzia duten itzulpenak ditu\n"
-"baina C# .dll formatuak ez du testuingururik onartzen\n"
-
-#: src/write-csharp.c:678
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "Huts \"%s\" direktorioa sortzerakoan"
 
-#: src/write-csharp.c:740
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
 
-#: src/write-java.c:912
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"mezu katalogoak testuinguruarekiko dependentzia duten itzulpenak ditu\n"
-"baina Java ResourceBundle formatuak ez du testuingururik onartzen\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
 
-#: src/write-java.c:937
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ez da baliozko java klase izena: %s"
 
-#: src/write-java.c:1021
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java klasearen konpilazioak huts egin du, saiatu --verbose erabiliz edo "
 "$JAVAC ezarriz"
 
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"Java klasearen konpilazioak huts egin du, saiatu --verbose erabiliz edo "
+"$JAVAC ezarriz"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "errorea \"%s\" idaztekatarako irekitzerakoan"
 
-#: src/write-po.c:767
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "internazionalizatutako kateek ezin dute `\\%c' ihes sekuentzia eduki"
 
-#: src/write-po.c:1213 src/write-po.c:1342
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3105,7 +3109,7 @@ msgstr ""
 " garbia erabiltzean pensta ezazu.\n"
 "%s\n"
 
-#: src/write-po.c:1225 src/write-po.c:1354
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3119,7 +3123,7 @@ msgstr ""
 " garbia erabiltzean pensta ezazu.\n"
 "%s\n"
 
-#: src/write-qt.c:668
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3127,7 +3131,7 @@ msgstr ""
 "mezu katalogoak forma plural itzulpenak ditu\n"
 "baina Qt mezu katalogo formatuak ez du plural kudeaketa onartzen\n"
 
-#: src/write-qt.c:694
+#: src/write-qt.c:693
 #, fuzzy
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
@@ -3136,7 +3140,7 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr "karakterera Qt formateatu Unicode in in n"
 
-#: src/write-qt.c:718
+#: src/write-qt.c:717
 #, fuzzy
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
@@ -3144,132 +3148,132 @@ msgid ""
 "strings, not in the untranslated strings\n"
 msgstr "karakterera Qt formateatu Unicode in in n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "errorea %s azpirpozesuan idazterakoan"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr "C formateatu t n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:149
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr "C formateatu t n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr "formateatu t n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "formateatu t n"
 
-#: src/x-awk.c:343 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "s l katea"
 
-#: src/x-awk.c:594
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "s l"
 
-#: src/x-c.c:1155 src/x-csharp.c:1502 src/x-java.c:860
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "s l"
 
-#: src/x-c.c:1179
+#: src/x-c.c:1218
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "s l katea"
 
-#: src/x-csharp.c:217 src/xgettext.c:1845
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, fuzzy, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr "ASCII katea s s Nork n"
 
-#: src/x-csharp.c:264
+#: src/x-csharp.c:268
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l Baliogabea Nork n"
 
-#: src/x-csharp.c:280
+#: src/x-csharp.c:284
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l osatu gabea Nork n"
 
-#: src/x-csharp.c:292
+#: src/x-csharp.c:296
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l Osatugabea - Nork n"
 
-#: src/x-csharp.c:301
+#: src/x-csharp.c:305
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l Osatugabea - Nork n"
 
-#: src/x-csharp.c:310 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv hutsa"
 
-#: src/x-csharp.c:333
+#: src/x-csharp.c:337
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr "s l Baliogabea Nork n"
 
-#: src/x-csharp.c:1383 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
 
-#: src/x-csharp.c:1505 src/x-java.c:863
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "s l katea"
 
-#: src/x-csharp.c:2009 src/x-java.c:1357
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: oharra: ')' aurkitu da '}' espero zen lekuan"
 
-#: src/x-csharp.c:2043 src/x-java.c:1391
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: oharra: '}' aurkitu da ')'espero zen lekuan"
 
-#: src/x-glade.c:459 src/x-glade.c:466
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:493
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3278,48 +3282,48 @@ msgstr ""
 "\"glade\" hizkuntza ez da onartzen. %s expat-en oinarritua.\n"
 "Bertsio hau expta gabe eraiki da.\n"
 
-#: src/x-java.c:483
+#: src/x-java.c:492
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "s l katea"
 
-#: src/x-perl.c:309
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: ez da kate amaiera aurkitzen \"%s\" fixtategi amaiera aurreko inon"
 
-#: src/x-perl.c:1035
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: eskuin giltza falta da hemen:  \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1155
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\l\") 8bit-eko karakterean\"%c\""
 
-#: src/x-perl.c:1175
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\u\") 8bit-eko karakterean\"%c\""
 
-#: src/x-perl.c:1209
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: aldagai interpolazio baliogabe a \"%c\"-en"
 
-#: src/x-perl.c:1222
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\L\") 8bit-eko karakterean\"%c\""
 
-#: src/x-perl.c:1239
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\U\") 8bit-eko karakterean\"%c\""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, fuzzy, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3327,7 +3331,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "ASCII katea s s Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3335,7 +3339,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Baliogabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3343,7 +3347,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l osatu gabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3351,7 +3355,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Osatugabea - Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3359,7 +3363,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Osatugabea - Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3367,27 +3371,27 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Baliogabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "\"%s\" kodeketa ezezaguna. ASCII erabiliaz aurrera egingo da."
 
-#: src/x-rst.c:110
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: kate definizio baliogabea"
 
-#: src/x-rst.c:174
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: zenbaki bat faltda da # ondoren"
 
-#: src/x-rst.c:209
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: kate espresio baliogabea"
 
-#: src/x-sh.c:1076
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3396,28 +3400,28 @@ msgstr ""
 "%s:%lu: oharra: $\"...\" sintasia zaharkiturik dago segurtasun "
 "arrazoiegatik ; eval_gettext erabili horren ordez"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing ezin da erabili irteera irteera estandarrean idazten denean"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:687
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "oharra: `%s' fitxategi hedaopena `%s' ezezaguna da, C probatuko da"
 
-#: src/xgettext.c:738
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Irauli kate itzulgarriak emandako sarrera fitxategietatik.\n"
 
-#: src/xgettext.c:761
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3426,12 +3430,12 @@ msgstr ""
 "  -d, --default-domain=IZENA   IZENA erabili irteerarako (messages.po "
 "ordez)\n"
 
-#: src/xgettext.c:763
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           idatzi irteera ezarritako fitxategian\n"
 
-#: src/xgettext.c:765
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3439,12 +3443,12 @@ msgstr ""
 "  -p, --output-dir=DIR        irteera fitxategiak DIR direktorioan utziko "
 "dira\n"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Sarrera fitxategiaren hizkuntza hautapena:\n"
 
-#: src/xgettext.c:772
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3463,12 +3467,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++-ren laburopena\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3477,7 +3481,7 @@ msgstr ""
 "Lehenespen bezala hizkuntza sarrera fitxategiaren izen hedapenaz igarriko "
 "da.\n"
 
-#: src/xgettext.c:785
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3486,41 +3490,41 @@ msgstr ""
 "      --from-code=NAME        sarrera fixtategien kodeket\n"
 "                                (Python, Tcl, Glade-en ezezik)\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Lehenespen modura sarrera fitxategiak ASCII direla suposatuko da.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:795
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FITXATEGIA.po  FITXATEGIA.po fitxategiko kateak ez dira "
 "irauliko\n"
 
-#: src/xgettext.c:797
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Hizkuntzaren aukera bereziak:\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           kate guztiak atera\n"
 
-#: src/xgettext.c:805 src/xgettext.c:812
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3534,14 +3538,14 @@ msgstr ""
 "                                Perl, PHP, GCC-source eta Glade hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3549,7 +3553,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:819
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3563,33 +3567,38 @@ msgstr ""
 "                                Tcl, Perl, PHP, GCC-source hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ANSI C trigraphs-ak ulertu sarreran\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC hizkuntzetan bakarrik)\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:829 src/xgettext.c:833
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ hizkuntz bakarrik)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    Qt formatuko kateak antzeman\n"
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost formatuko kateak antzeman\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3597,17 +3606,17 @@ msgstr ""
 "      --debug                 kate formatu atzemateari buruzko informazio "
 "hedatuagoa\n"
 
-#: src/xgettext.c:854
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     idatzi Java .properties fitxategi bat\n"
 
-#: src/xgettext.c:869
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3615,7 +3624,17 @@ msgstr ""
 "      --foreign-user          alde batera utzi FSF copyright-a kanpoko "
 "erabiltzaileen irteeran\n"
 
-#: src/xgettext.c:873
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3623,7 +3642,7 @@ msgstr ""
 "      --msgid-bugs-address=EPOSTA@HELBIDEA  msgid erroreentzat erreporte "
 "helbidea ezarri\n"
 
-#: src/xgettext.c:875
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3632,7 +3651,7 @@ msgstr ""
 "  -M, --msgstr-prefix[=KATEA]  KATEA erabili edo \"\" aurrizki bezala msgstr "
 "sarreretan\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3641,7 +3660,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=KATEA]  KATEA erabili edo \"\" atzizki bezala msgstr "
 "sarreretan\n"
 
-#: src/xgettext.c:1642
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3649,30 +3668,30 @@ msgid ""
 msgstr ""
 "--flag argumentuak ez du ::[pasa-] sintasia: %s"
 
-#: src/xgettext.c:1741
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "sarrera estandarra"
 
-#: src/xgettext.c:1921 src/xgettext.c:1954 src/xgettext.c:2012
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: oharra: "
 
-#: src/xgettext.c:1924
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1925
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1956
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3681,7 +3700,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2014
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3691,28 +3710,28 @@ msgstr ""
 "gettext(\"\")-ek meta informazioa duen goiburua\n"
 "itzultzen du, ez date hutsa.\n"
 
-#: src/xgettext.c:2618
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "oharra: argumentu ezarpen zalanatzagarria '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:2645
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "oharra: kontestua falta da '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:2670
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "oharra: kontestua falta da '%.*s' hitz-gakoaren plural arumentuarentzat"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontestu parekatze okerra formatu singular eta pluralaren artean"
 
-#: src/xgettext.c:2771
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3724,7 +3743,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS aldagaia hor; bestela mesedez ezarri\n"
 "--msgid-bugs-address aukera komando lerroan.\n"
 
-#: src/xgettext.c:2970
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "`%s' hizkuntza ezezaguna"
@@ -3732,3 +3751,34 @@ msgstr "`%s' hizkuntza ezezaguna"
 #: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
+
+#, fuzzy
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Anizkoitza nori k."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Hau software librea da; iturburua ikusi kopiatze baldintzetarako.  EZ "
+#~ "dago inolako bermerik;\n"
+#~ "ezta EGOKITASUNA MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO "
+#~ "ERABILTZEKO.\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "mezu katalogoak testuinguruarekiko dependentzia duten itzulpenak ditu\n"
+#~ "baina C# .dll formatuak ez du testuingururik onartzen\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "mezu katalogoak testuinguruarekiko dependentzia duten itzulpenak ditu\n"
+#~ "baina Java ResourceBundle formatuak ez du testuingururik onartzen\n"
diff --git a/gettext-tools/po/fi.po b/gettext-tools/po/fi.po
index dc2d42f74..726d02b09 100644
--- a/gettext-tools/po/fi.po
+++ b/gettext-tools/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2002-06-05 18:06+0200\n"
 "Last-Translator: Sami J. Laine \n"
 "Language-Team: Finnish \n"
@@ -16,87 +16,88 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, fuzzy, c-format
 msgid "invalid argument %s for %s"
 msgstr "virheellinen argumentti `%s' `%s':lle"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, fuzzy, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Kelvolliset argumentit ovat:"
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ei voi luoda putkea"
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ei voi luoda putkea"
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "virhe avattaessa \"%s\" lukemista varten"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "ei voida avata varmuuskopiotiedostoa \"%s\" kirjoittamista varten"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "virhe luettaessa \"%s\""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "virhe kirjoitettaessa \"%s\""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "virhe \"%s\" lukemisen jälkeen"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Java-kääntäjää ei löytynyt, yritä gcj:n asentamista tai aseta $JAVAC"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, fuzzy, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -106,120 +107,120 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Tuntematon järjestelmän virhe"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s aliprosessi epäonnistui"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: valitsin `%s' on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: valitsin `--%s' ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: valitsin `%c%s' ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: valitsin `%s' vaatii argumentin\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: tuntematon valitsin `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: tuntematon valitsin `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: virheellinen valitsin -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: virheellinen valitsin -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: valitsin vaatii argumentin -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: valitsin `-W %s' on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: valitsin `-W %s' ei salli argumenttia\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, fuzzy, c-format
 msgid "error while writing \"%s\" file"
 msgstr "virhe kirjoitettaessa \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java-kääntäjää ei löytynyt, yritä gcj:n asentamista tai aseta $JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Java virtuaalikonetta ei löytynyt, yritä gij:n asentamista tai aseta $JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, fuzzy, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s aliprosessi"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "muisti loppu"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "ei voi luoda putkea"
@@ -243,282 +244,289 @@ msgstr "ei voi luoda putkea"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, fuzzy, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "%s aliprosessi epäonnistui"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s aliprosessi"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s aliprosessi vastaanotti fataalin signaalin %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "muotomäärittelyä argumentille %u ei ole olemassa 'msgid':lle '%s':ssä"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "muotomäärittely argumentille %u ei ole '%s':ssä"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr ""
 "muotomäärittelyiden määrä 'msgid':ssä ja '%s':ssä argumentille %u ei ole sama"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "muotomäärittelyiden määrä 'msgid':ssä ja '%s':ssä ei täsmää"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "muotomäärittely argumentille {%u}, kuten '%s':ssä, ei ole 'msgid':ssä"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "muotomäärittely argumentille {%u} ei ole '%s':ssä"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr ""
 "muotomäärittelyt 'msgid':ssä ja '%s':ssä argumentille {%u} eivät ole samat"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -529,83 +537,83 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "muotomäärittelyt 'msgid' ja '%s' eivät ole yhdenmukaiset"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr ""
 "muotomäärittelyt '%s':ssä eivät ole 'msgid':n muotomäärittelyiden osajoukko"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "muotomäärittelyä argumentille '%s' ei löyty '%s':stä"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -614,7 +622,7 @@ msgstr ""
 "muotomäärittelyt 'mdgid':ssä edellyttävät kartoitusta, määrittelyt '%s':ssä "
 "edellyttävät "
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -623,127 +631,126 @@ msgstr ""
 "muotomäärittelyt 'msgid':ss' edellyttävät järjestettyä joukkoa, määrittelyt "
 "'%s':ss' edellyttävät "
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "muotomäärittelyä argumentille '%s', kuten '%s':ssä, ei löydy "
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr ""
 "muotomäärittely 'msgid':ssä ja '%s':ssä argumentille '%s' eivät ole samat"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Tämä on vapaa ohjelmisto; kts. lähdekoodi kopioinnin ehdoille. Ohjelmisolle\n"
-"EI myönnetä takuuta; ei edes KAUPATTAVUUDELLE tai SOVELTUVUUDELLE TIETTYYN\n"
-"tarkoitukseen.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Kirjoittanut %s\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "liian monta argumenttia"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Yritä `%s --help' saadaksesi lisää tietoja.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Tulosta laitteen isäntänimi.\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, fuzzy, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -756,34 +763,34 @@ msgstr ""
 "                        sen mahdolliset lisänimet\n"
 "  -i, --ip-address      osoitteet isäntänimelle\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, fuzzy, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -792,337 +799,342 @@ msgstr ""
 "  -V, --version               näyttää ohjelmiston version ja lopettaa\n"
 "                              suorituksen\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "Ilmoita ohjelmiston vioista osoitteeseen .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "ei saatu isäntänimeä"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "enintään yksi syötetiedosto on sallittu"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ja %s ovat toisensa poissulkevia"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1136,51 +1148,51 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1188,39 +1200,53 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr ""
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr ""
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Käyttö: %s [VALITSIN]\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1231,81 +1257,81 @@ msgid ""
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, c-format
 msgid "this message is untranslated"
 msgstr ""
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr ""
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr ""
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr ""
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1318,74 +1344,74 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr ""
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "enintään yksi syötetiedosto on sallittu"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1394,22 +1420,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr ""
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1419,67 +1445,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, fuzzy, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s aliprosessi epäonnistui"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "ei riittävästi argumentteja"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1487,210 +1513,210 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, fuzzy, c-format
 msgid "communication with %s subprocess failed"
 msgstr "%s aliprosessi epäonnistui"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, fuzzy, c-format
 msgid "read from %s subprocess failed"
 msgstr "%s aliprosessi epäonnistui"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, fuzzy, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "virheellinen argumentti `%s' `%s':lle"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "virheellinen argumentti `%s' `%s':lle"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Käyttö: %s [VALITSIN]\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1699,48 +1725,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1748,33 +1774,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1782,109 +1808,109 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr ""
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, fuzzy, c-format
 msgid "error while reading \"%s\""
 msgstr "virhe luettaessa \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1924,30 +1950,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1955,24 +1981,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -1980,54 +2006,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, fuzzy, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s aliprosessi epäonnistui"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2039,54 +2065,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2095,7 +2121,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2104,7 +2130,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2113,12 +2139,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2126,7 +2152,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2135,7 +2161,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2143,169 +2169,169 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr ""
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr ""
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr ""
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "virhe avattaessa \"%s\" lukemista varten"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2415,78 +2441,78 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr ""
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s ja %s ovat toisensa poissulkevia"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2494,41 +2520,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2541,201 +2567,201 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr ""
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr ""
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr ""
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr ""
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr ""
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr ""
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr ""
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr ""
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr ""
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr ""
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr ""
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr ""
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr ""
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr ""
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Kirjoittanut %s\n"
@@ -2744,139 +2770,136 @@ msgstr "Kirjoittanut %s\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "virhe avattaessa \"%s\" lukemista varten"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "liian monta argumenttia"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "virhe kirjoitettaessa \"%s\""
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, fuzzy, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ei voi luoda putkea"
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr ""
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "%s aliprosessi epäonnistui"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, fuzzy, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "virhe avattaessa \"%s\" lukemista varten"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2885,7 +2908,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2894,13 +2917,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -2908,177 +2931,182 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "virhe kirjoitettaessa \"%s\""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr ""
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr ""
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
+#: src/x-java.c:492
+#, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr ""
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: virheellinen valitsin -- %c\n"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3086,7 +3114,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3094,7 +3122,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3102,7 +3130,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3110,7 +3138,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3118,7 +3146,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3126,77 +3154,77 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3208,58 +3236,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3268,14 +3296,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3283,7 +3311,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3292,104 +3320,119 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3398,34 +3441,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3433,15 +3476,29 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Tämä on vapaa ohjelmisto; kts. lähdekoodi kopioinnin ehdoille. "
+#~ "Ohjelmisolle\n"
+#~ "EI myönnetä takuuta; ei edes KAUPATTAVUUDELLE tai SOVELTUVUUDELLE "
+#~ "TIETTYYN\n"
+#~ "tarkoitukseen.\n"
+
 #, fuzzy
 #~ msgid "write to grep subprocess failed"
 #~ msgstr "%s aliprosessi epäonnistui"
diff --git a/gettext-tools/po/fr.po b/gettext-tools/po/fr.po
index e32cd0425..d24a13f1c 100644
--- a/gettext-tools/po/fr.po
+++ b/gettext-tools/po/fr.po
@@ -4,13 +4,13 @@
 # Il a été le traducteur jusqu'en 2001.
 # Michel Robitaille , traducteur depuis/since 1996.
 # Christophe Combelles , 2006
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-27 15:20+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-10-27 13:35+0200\n"
 "Last-Translator: Christophe Combelles \n"
 "Language-Team: French \n"
diff --git a/gettext-tools/po/gettext-tools.pot b/gettext-tools/po/gettext-tools.pot
index 11cd28a35..24c687a7b 100644
--- a/gettext-tools/po/gettext-tools.pot
+++ b/gettext-tools/po/gettext-tools.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -17,87 +17,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr ""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr ""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -106,119 +107,119 @@ msgstr ""
 msgid "Unknown system error"
 msgstr ""
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr ""
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr ""
@@ -242,280 +243,287 @@ msgstr ""
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr ""
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr ""
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr ""
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr ""
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -526,211 +534,214 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr ""
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr ""
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 "tuple"
 msgstr ""
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 "mapping"
 msgstr ""
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr ""
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr ""
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr ""
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -738,369 +749,374 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr ""
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr ""
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1114,51 +1130,51 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1166,39 +1182,53 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr ""
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr ""
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1209,81 +1239,81 @@ msgid ""
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, c-format
 msgid "this message is untranslated"
 msgstr ""
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr ""
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr ""
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr ""
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1296,74 +1326,74 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr ""
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr ""
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1372,22 +1402,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr ""
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1397,67 +1427,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr ""
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1465,210 +1495,210 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1677,48 +1707,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1726,33 +1756,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1760,109 +1790,109 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr ""
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr ""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1902,30 +1932,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1933,24 +1963,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -1958,54 +1988,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2017,54 +2047,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2073,7 +2103,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2082,7 +2112,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2091,12 +2121,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2104,7 +2134,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2113,7 +2143,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2121,169 +2151,169 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr ""
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr ""
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr ""
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2393,78 +2423,78 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr ""
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr ""
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2472,41 +2502,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2519,201 +2549,201 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr ""
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr ""
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr ""
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr ""
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr ""
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr ""
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr ""
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr ""
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr ""
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr ""
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr ""
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr ""
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr ""
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr ""
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr ""
@@ -2722,139 +2752,136 @@ msgstr ""
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr ""
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr ""
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr ""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr ""
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr ""
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2863,7 +2890,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2872,13 +2899,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -2886,177 +2913,182 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr ""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr ""
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr ""
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
+#: src/x-java.c:492
+#, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr ""
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3064,7 +3096,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3072,7 +3104,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3080,7 +3112,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3088,7 +3120,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3096,7 +3128,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3104,77 +3136,77 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3186,58 +3218,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3246,14 +3278,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3261,7 +3293,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3270,104 +3302,119 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3376,34 +3423,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3411,11 +3458,11 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
diff --git a/gettext-tools/po/gl.po b/gettext-tools/po/gl.po
index ed6750cb1..335e6a305 100644
--- a/gettext-tools/po/gl.po
+++ b/gettext-tools/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.10.39\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2001-07-28 17:00+0200\n"
 "Last-Translator: Jesús Bravo Álvarez \n"
 "Language-Team: Galician \n"
@@ -20,87 +20,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro ao abrir \"%s\" para lectura"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "erro ao abrir \"%s\" para escribir"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "erro ao escribi-lo ficheiro \"%s\""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -109,119 +110,119 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Erro de sistema descoñecido"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: a opción `%s' é ambigua\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: a opción `--%s' non permite ningún argumento\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: a opción `%c%s' non permite ningún argumento\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: a opción `%s' require un argumento\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción `--%s' descoñecida\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción `%c%s' descoñecida\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción non válida -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: a opción require un argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: a opción `-W %s' é ambigua\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: a opción `-W %s' non permite ningún argumento\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ao escribi-lo ficheiro \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esgotada"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
@@ -245,281 +246,288 @@ msgstr "non se pode crea-lo ficheiro de sa
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -530,83 +538,83 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr ""
 "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -614,7 +622,7 @@ msgid ""
 msgstr ""
 "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -622,126 +630,125 @@ msgid ""
 msgstr ""
 "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Isto é software libre; vexa o código para as condicións de copia.  NON hai\n"
-"ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n"
-"FIN DETERMINADO.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Use `%s --help' para máis información.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -749,339 +756,344 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 #, fuzzy
 msgid "Report bugs to .\n"
 msgstr "Comunique os erros a .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "precísanse exactamente dous ficheiros de entrada"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s son mutuamente excluíntes"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1103,31 +1115,31 @@ msgstr ""
 "  -V, --version            amosa-la información da versión e saír\n"
 "  -w, --width=NÚMERO       establece-la anchura da páxina de saída\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "o criterio de selección indicado é imposible (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1157,51 +1169,51 @@ msgstr ""
 "comentarios e comentarios de extracción mantéñense, pero só do primeiro\n"
 "ficheiro para definilos.  Mantéñense as posicións de tódolos ficheiros PO.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1209,39 +1221,53 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "precísanse exactamente dous ficheiros de entrada"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1267,81 +1293,81 @@ msgstr ""
 "un emparellamento exacto, úsase coincidencia difusa, de xeito que se produza\n"
 "un mellor diagnóstico.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "aviso: esta mensaxe non se usa"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "esta mensaxe úsase mais non está definida..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mais esta definición é semellante"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "aviso: esta mensaxe non se usa"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "atopouse %d erro grave"
 msgstr[1] "atopáronse %d erros graves"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "téñense que indicar polo menos dous ficheiros"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1370,74 +1396,74 @@ msgstr ""
 "comentarios e comentarios de extracción mantéñense, pero só do primeiro\n"
 "ficheiro para definilos.  Mantéñense as posicións de tódolos ficheiros PO.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "precísanse exactamente dous ficheiros de entrada"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1446,22 +1472,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "faltan argumentos"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1471,67 +1497,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "faltan argumentos"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "téñense que indicar polo menos dous ficheiros"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1539,210 +1565,210 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaxe traducida"
 msgstr[1] "%d mensaxes traducidas"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducción difusa"
 msgstr[1] ", %d traduccións difusas"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensaxe sen traducir"
 msgstr[1] ", %d mensaxes sen traducir"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1751,48 +1777,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1800,33 +1826,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1834,117 +1860,117 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
 "%*s  aviso: a conversión de código de caracteres non vai funcionar"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Falta o código de caracteres na cabeceira.\n"
 "A conversión da mensaxe ao código do usuario non vai funcionar.\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
 "%*s  aviso: a conversión de código de caracteres non vai funcionar"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "o nome de dominio \"%s\" non é axeitado para nome de ficheiro"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "o nome de dominio \"%s\" non é axeitado como nome de ficheiro:\n"
 "empregarase un prefixo"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "directiva `domain %s' ignorada"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "entrada `msgstr' baleira ignorada"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "entrada `msgstr' difusa ignorada"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: o ficheiro fonte contén traduccións difusas"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1984,30 +2010,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2015,24 +2041,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2040,54 +2066,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2099,54 +2125,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: aviso: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2155,7 +2181,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2164,7 +2190,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2173,12 +2199,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2186,7 +2212,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2195,7 +2221,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2203,159 +2229,159 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "secuencia de control ilegal"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "secuencia de control ilegal"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "secuencia de control ilegal"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "esta mensaxe úsase mais non está definida en %s"
 msgstr[1] "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "esta mensaxe úsase mais non está definida en %s"
 msgstr[1] "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "as entradas `msgid' e `msgid_plural' non comezan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "as entradas `msgid' e `msgstr[%u]' non comezan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "as entradas `msgid' e `msgstr' non comezan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "as entradas `msgid' e `msgid_plural' non rematan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "as entradas `msgid' e `msgstr[%u]' non rematan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "as entradas `msgid' e `msgstr' non rematan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "falta o campo `%s' na cabeceira"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "o campo `%s' da cabeceira tería que comezar ao principio da liña"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "algúns campos da cabeceira aínda teñen o valor inicial por defecto"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "o campo `%s' aínda ten o valor inicial por defecto"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro ao abrir \"%s\" para lectura"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2364,15 +2390,15 @@ msgstr ""
 "O código de caracteres \"%s\" non está soportado. %s depende de\n"
 "iconv(), e iconv() non soporta \"%s\".\n"
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2496,17 +2522,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2515,61 +2541,61 @@ msgstr ""
 "%sLidas %ld antigas + %ld referencias, mesturadas %ld, difusas %ld, faltan %"
 "ld, obsoletas %ld.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " rematado.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s e %s son mutuamente excluíntes"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2577,41 +2603,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2624,24 +2650,24 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2650,7 +2676,7 @@ msgstr ""
 "O código de caracteres \"%s\" non ten un nome portable.\n"
 "A conversión da mensaxe ao código do usuario podería non funcionar.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2659,7 +2685,7 @@ msgstr ""
 "O código de caracteres \"%s\" non está soportado. %s depende de\n"
 "iconv(), e iconv() non soporta \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2667,15 +2693,15 @@ msgstr ""
 "Se instala GNU libiconv e logo reinstala o GNU gettext\n"
 "podería arranxarse o problema.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Continuando de calquera xeito, espere atopar erros de análise."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Continuando de calquera xeito."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2684,7 +2710,7 @@ msgstr ""
 "O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n"
 "Esta versión foi compilada sen iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2692,150 +2718,150 @@ msgstr ""
 "Falta o código de caracteres na cabeceira.\n"
 "A conversión da mensaxe ao código do usuario non vai funcionar.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso inconsistente de #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "falta a sección `msgstr[]'"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "falta a sección `msgid_plural'"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "falta a sección `msgstr'"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "a primera forma do plural ten un índice distinto a cero"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "a forma do plural ten un índice erróneo"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "demasiados erros, interrompendo"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "secuencia multibyte non válida"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "secuencia multibyte non válida"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "secuencia multibyte non válida"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palabra chave \"%s\" descoñecida"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "secuencia de control ilegal"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "fin de ficheiro nunha cadea"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "fin de liña nunha cadea"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro non pode conter directivas de dominio"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "definición de mensaxe duplicada"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...este é o lugar da primeira definición"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "ficheiro \"%s\" truncado"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "o ficheiro \"%s\" contén unha cadea non rematada en NUL"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "o ficheiro \"%s\" non está no formato .mo de GNU"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "o ficheiro \"%s\" contén unha cadea non rematada en NUL"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s:%d: aviso: palabra chave aniñada no argumento de palabra chave"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%d: aviso: palabra chave aniñada no argumento de palabra chave"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Escrito por %s.\n"
@@ -2844,140 +2870,137 @@ msgstr "Escrito por %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro ao abrir \"%s\" para lectura"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "demasiados argumentos"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "erro ao escribi-lo ficheiro \"%s\""
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "saída estándar"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "erro ao abrir \"%s\" para escribir"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "as mensaxes internacionalizadas non deben conte-la secuencia de escape `\\%c'"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2986,7 +3009,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2995,13 +3018,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3009,135 +3032,135 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "erro ao escribi-lo ficheiro \"%s\""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3146,42 +3169,47 @@ msgstr ""
 "O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n"
 "Esta versión foi compilada sen iconv().\n"
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: opción non válida -- %c\n"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3189,7 +3217,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3197,7 +3225,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3205,7 +3233,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3213,7 +3241,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3221,7 +3249,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3229,77 +3257,77 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "non se pode usar --join-existing cando a saída se escribe en stdout"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext non funciona sen palabras chave polas que buscar"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "aviso: o ficheiro `%s' coa extensión `%s' é descoñecido; tentaráse C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3311,58 +3339,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3371,14 +3399,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3386,7 +3414,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3395,104 +3423,119 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: aviso: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3501,34 +3544,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3536,15 +3579,28 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "linguaxe `%s' descoñecida"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Isto é software libre; vexa o código para as condicións de copia.  NON "
+#~ "hai\n"
+#~ "ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n"
+#~ "FIN DETERMINADO.\n"
+
 #~ msgid "%s: warning: "
 #~ msgstr "%s: aviso: "
 
diff --git a/gettext-tools/po/id.po b/gettext-tools/po/id.po
index 2ad594c16..608689327 100644
--- a/gettext-tools/po/id.po
+++ b/gettext-tools/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 1999-09-19 10:24+07:00\n"
 "Last-Translator: Tedi Heriyanto \n"
 "Language-Team: Indonesian \n"
@@ -14,87 +14,88 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "tidak dapat membuat file output \"%s\""
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "tidak dapat membuat file output \"%s\""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "tidak dapat membuat file output \"%s\""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "tidak dapat membuat file output \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "kesalahan saat membuka \"%s\" untuk dibaca"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "kesalahan ketika membuka \"%s\" untuk ditulis"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "kesalahan saat menulis file \"%s\""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -103,119 +104,119 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Kesalahan sistem tak dikenal"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: pilihan `%s' rancu\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: pilihan `--%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: pilihan `%c%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "pilihan %s: `%s' memerlukan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: pilihan tak dikenal `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: pilihan tak dikenal `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: pilihan ilegal -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: pilihan tidak valid -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: pilihan `-W %s' rancu\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: pilihan `-W %s' tidak membolehkan sebuah argumen\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "kesalahan saat menulis file \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "Memori habis"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "tidak dapat membuat file output \"%s\""
@@ -239,280 +240,287 @@ msgstr "tidak dapat membuat file output \"%s\""
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -523,215 +531,214 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 "tuple"
 msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 "mapping"
 msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-# )
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Hak Cipta (C) %s Free Software Foundation, Inc.\n"
-"Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak ada\n"
-"jaminan; bahkan untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -739,339 +746,344 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 #, fuzzy
 msgid "Report bugs to .\n"
 msgstr "Laporkan kesalahan ke .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "dibutuhkan tepat 2 file input"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s dan %s adalah mutually exclusive"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "tidak diberikan file input"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1090,31 +1102,31 @@ msgstr ""
 "  -V, --version           tampilkan informasi versi dan keluar\n"
 "  -w, --width=NUMBER      set lebar halaman output\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "digunakan kriteria pemilihan yang tidak mungkin (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1142,51 +1154,51 @@ msgstr ""
 "komentar ekstraksi akan dijaga, tetapi hanya dari file PO pertama yang\n"
 "mendefinisikan mereka. Posisi file dari seluruh file PO akan dijaga.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1194,39 +1206,53 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "tidak diberikan file input"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "dibutuhkan tepat 2 file input"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1250,80 +1276,80 @@ msgstr ""
 "program anda. Bilamana tidak ditemukan kecocokan yang tepat, digunakan fuzzy\n"
 "matching untuk menghasilkan diagnostik yang lebih baik.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "peringatan: pesan ini tidak digunakan"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "pesan ini digunakan tapi tidak didefinisikan..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...tetapi definisi ini serupa"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "peringatan: pesan ini tidak digunakan"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "ditemukan %d kesalahan fatal"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "paling tidak dua file harus dispesifikasikan"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1350,74 +1376,74 @@ msgstr ""
 "komentar ekstraksi akan dijaga, tetapi hanya dari file PO pertama yang\n"
 "mendefinisikan mereka. Posisi file dari seluruh file PO akan dijaga.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "tidak diberikan file input"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "dibutuhkan tepat 2 file input"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1426,22 +1452,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "Argumen hilang"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1451,67 +1477,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "Argumen hilang"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "paling tidak dua file harus dispesifikasikan"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1519,207 +1545,207 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, fuzzy, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d pesan diterjemahkan"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, fuzzy, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d terjemahan fuzzy"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, fuzzy, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d pesan belum diterjemahkan"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1728,48 +1754,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "tidak diberikan file input"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1777,33 +1803,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1811,110 +1837,110 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nama domain \"%s\" tidak sesuai dengan nama file"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nama domain \"%s\" tidak sesuai dengan nama file: akan menggunakan prefix"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direktiv `domain %s' diabaikan"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "masukan `msgstr' kosong diabaikan"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "masukan fuzzy `msgstr' diabaikan"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: peringatan: file source mengandung terjemahan fuzzy"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1954,30 +1980,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1985,24 +2011,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2010,54 +2036,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2069,54 +2095,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2125,7 +2151,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2134,7 +2160,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2143,12 +2169,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2156,7 +2182,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2165,7 +2191,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2173,174 +2199,174 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "urutan kendali ilegal"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "urutan kendali ilegal"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "urutan kendali ilegal"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 msgstr[1] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 msgstr[1] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "headerfield `%s' tidak ada dalam header"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "header field `%s' harus dimulai di awal baris"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "beberapa field header masih memiliki nilai baku awal"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "field `%s' masih memiliki nilai baku awal"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "kesalahan saat membuka \"%s\" untuk dibaca"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2459,17 +2485,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2478,61 +2504,61 @@ msgstr ""
 "%sMembaca %d lama + %d referensi, digabung %d, fuzzy %d, hilang %d, kuno %"
 "d.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " selesai.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s dan %s adalah mutually exclusive"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2540,41 +2566,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "tidak diberikan file input"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2587,208 +2613,208 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr ""
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, fuzzy, c-format
 msgid "missing `msgstr[]' section"
 msgstr "bagian `msgstr' hilang"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, fuzzy, c-format
 msgid "missing `msgid_plural' section"
 msgstr "bagian `msgstr' hilang"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "bagian `msgstr' hilang"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "terlalu banyak kesalahan, dibatalkan"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, fuzzy, c-format
 msgid "invalid multibyte sequence"
 msgstr "urutan kendali ilegal"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "kata kunci \"%s\" tidak dikenal"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, fuzzy, c-format
 msgid "invalid control sequence"
 msgstr "urutan kendali ilegal"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "end-of-file dalam string"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "end-of-line dalam string"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "file ini tidak boleh mengandung direktiv domain"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "definisi pesan ganda"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...ini adalah lokasi definisi pertama"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "file \"%s\" terpotong"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "file \"%s\" bukan dalam format GNU .mo"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file \"%s\" bukan dalam format GNU .mo"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "file \"%s\" bukan dalam format GNU .mo"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Ditulis oleh %s.\n"
@@ -2797,139 +2823,136 @@ msgstr "Ditulis oleh %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "kesalahan saat membuka \"%s\" untuk dibaca"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "terlalu banyak argumen"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "kesalahan saat menulis file \"%s\""
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "tidak dapat membuat file output \"%s\""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "standard output"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "kesalahan ketika membuka \"%s\" untuk ditulis"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2938,7 +2961,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2947,13 +2970,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -2961,177 +2984,182 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "kesalahan saat menulis file \"%s\""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: peringatan: string literal yang unterminated"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: pilihan tidak valid -- %c\n"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3139,7 +3167,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3147,7 +3175,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3155,7 +3183,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3163,7 +3191,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3171,7 +3199,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3179,77 +3207,77 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing tidak dapat digunakan ketika output ditulis ke stdout"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "peringatan: file `%s' ekstensi `%s' tidak dikenal; dicoba C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "tidak diberikan file input"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3261,58 +3289,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3321,14 +3349,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3336,7 +3364,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3345,104 +3373,119 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3451,34 +3494,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3486,15 +3529,28 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "bahasa `%s' tidak dikenal"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+# )
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Hak Cipta (C) %s Free Software Foundation, Inc.\n"
+#~ "Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak "
+#~ "ada\n"
+#~ "jaminan; bahkan untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n"
+
 #, fuzzy
 #~ msgid "%s:%lu: warning: unterminated string"
 #~ msgstr "%s:%d: peringatan: string literal yang unterminated"
diff --git a/gettext-tools/po/it.po b/gettext-tools/po/it.po
index 55ceb6c2d..fc3530d02 100644
--- a/gettext-tools/po/it.po
+++ b/gettext-tools/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-27 15:20+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-10-30 17:52+0000\n"
 "Last-Translator: Marco Colombo \n"
 "Language-Team: Italian \n"
diff --git a/gettext-tools/po/ja.po b/gettext-tools/po/ja.po
index 130e679e7..9c211ea17 100644
--- a/gettext-tools/po/ja.po
+++ b/gettext-tools/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-05-15 02:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-06-13 23:39+0900\n"
 "Last-Translator: Masahito Yamaga \n"
 "Language-Team: Japanese \n"
@@ -15,88 +15,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "%2$s ¤ËÂФ¹¤ë°ú¿ô %1$s ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "%2$s ¤ËÂФ¹¤ë°ú¿ô %1$s ¤¬Û£Ëæ¤Ç¤¹"
 
-#: gnulib-lib/argmatch.c:154
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Àµ¤·¤¤°ú¿ô:"
 
-#: gnulib-lib/clean-temp.c:334
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "°ì»þ¥Ç¥£¥ì¥¯¥È¥ê¤ò¸«ÉÕ¤±¤é¤ì¤Þ¤»¤ó. $TMPDIR ¤òÀßÄꤷ¤Æ¤ß¤Æ¤¯¤À¤µ¤¤"
 
-#: gnulib-lib/clean-temp.c:348
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "¥Æ¥ó¥×¥ì¡¼¥È \"%s\" ¤ò»È¤Ã¤Æ°ì»þ¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: gnulib-lib/clean-temp.c:444
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë \"%s\" ¤òºï½ü¤Ç¤­¤Þ¤»¤ó"
 
-#: gnulib-lib/clean-temp.c:459
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "°ì»þ¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "½ñ¤­¹þ¤ß¥¨¥é¡¼"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:55 src/msggrep.c:245
-#: src/open-catalog.c:122 src/read-mo.c:253 src/read-tcl.c:125
-#: src/urlget.c:201 src/xgettext.c:1750 src/xgettext.c:1763
-#: src/xgettext.c:1773
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" ¤òÆɤ߹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/copy-file.c:74
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë \"%s\" ¤ò½ñ¤­¹þ¤ßÍѤ˳«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: gnulib-lib/copy-file.c:82 src/urlget.c:213
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "\"%s\" ¤òÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:92
-#: gnulib-lib/copy-file.c:131
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "\"%s\" ¤ò½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/copy-file.c:94 gnulib-lib/copy-file.c:133 src/urlget.c:223
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "\"%s\" ¤òÆɤ߹þ¤ó¤À¸å¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:840
-#: src/msginit.c:908 src/msginit.c:1068 src/msginit.c:1151
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() ¼ºÇÔ"
 
-#: gnulib-lib/csharpcomp.c:540
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C# ¥³¥ó¥Ñ¥¤¥é¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó. pnet ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# ²¾ÁÛ¥Þ¥·¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó. pnet ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤"
@@ -105,123 +105,123 @@ msgstr "C# 
 msgid "Unknown system error"
 msgstr "̤ÃΤΥ·¥¹¥Æ¥à¥¨¥é¡¼"
 
-#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:261 gnulib-lib/execute.c:303
-#: gnulib-lib/pipe.c:230 gnulib-lib/pipe.c:348 gnulib-lib/pipe.c:408
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ïǧ¼±¤µ¤ì¤Þ¤»¤ó\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ïǧ¼±¤µ¤ì¤Þ¤»¤ó\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: °ú¿ô¤¬É¬Íפʥª¥×¥·¥ç¥ó -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: gnulib-lib/javacomp.c:128 gnulib-lib/javacomp.c:142
-#: gnulib-lib/javacomp.c:158
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class ¤ËÂФ¹¤ë̵¸ú¤Ê source_version °ú¿ô"
 
-#: gnulib-lib/javacomp.c:173 gnulib-lib/javacomp.c:194
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class ¤ËÂФ¹¤ë̵¸ú¤Ê target_version °ú¿ô"
 
-#: gnulib-lib/javacomp.c:505 src/write-csharp.c:714 src/write-java.c:988
-#: src/write-java.c:1000
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" ¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/javacomp.c:512 src/write-catalog.c:254 src/write-catalog.c:318
-#: src/write-csharp.c:723 src/write-java.c:1009 src/write-mo.c:812
-#: src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" ¥Õ¥¡¥¤¥ë¤ò½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Java ¥³¥ó¥Ñ¥¤¥é¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó. gcj ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤« $JAVAC ¤òÀßÄꤷ¤Æ¤ß"
 "¤Æ¤¯¤À¤µ¤¤"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Java ²¾ÁÛ¥Þ¥·¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó. gij ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤« $JAVA ¤òÀßÄꤷ¤Æ¤¯"
 "¤À¤µ¤¤"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:848 src/msginit.c:916
-#: src/msginit.c:1076
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹Æþ½ÐÎÏ¥¨¥é¡¼"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:39 src/msgl-check.c:452 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:436 libgettextpo/gettext-po.c:1245
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/pipe.c:156 gnulib-lib/pipe.c:159 gnulib-lib/pipe.c:263
-#: gnulib-lib/pipe.c:266
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "¥Ñ¥¤¥×¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
@@ -245,73 +245,73 @@ msgstr "
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:230
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "¥¨¥é¡¼¥³¡¼¥É 0x%08x ¤Ç DuplicateHandle ¼ºÇÔ"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle ¼ºÇÔ"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤¬Ã×̿Ū¤Ê¥·¥°¥Ê¥ë %d ¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr "'%s' ¤Ï 'msgid' ¤È°ã¤Ã¤ÆÀµ¤·¤¤ %s ·Á¼°¤Îʸ»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. Íýͳ: %s"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:624 src/format-librep.c:313
-#: src/format-pascal.c:402 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:138 src/format-tcl.c:391 src/format-ycp.c:145
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "°ú¿ô %u ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬ '%s' ¤Î¤è¤¦¤Ë 'msgid' ¤Ë¸ºß¤·¤Þ¤»¤ó"
 
-#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:634 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
-#: src/format-qt.c:137 src/format-tcl.c:401 src/format-ycp.c:144
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "°ú¿ô %u ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬ '%s' ¤Ë¸ºß¤·¤Þ¤»¤ó"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:911
-#: src/format-elisp.c:379 src/format-gcc-internal.c:654
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
-#: src/format-php.c:381 src/format-python.c:511 src/format-tcl.c:421
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr ""
 "°ú¿ô %2$u ¤ËÂФ¹¤ë 'msgid' ¤È '%1$s' ¤Ç¤Î·Á¼°¤Î»ØÄ꤬Ʊ¤¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤¬, | ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹¤¬ | ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó."
 
-#: src/format-c.c:182
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -320,100 +320,107 @@ msgstr ""
 "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '<' ¤Î¸å¤Î¥È¡¼¥¯¥ó¤Ï¥Õ¥©¡¼¥Þ¥Ã¥Èµ­½Ò»Ò¥Þ¥¯¥í̾¤Ç¤Ï¤¢¤ê¤Þ¤»"
 "¤ó. Àµ¤·¤¤¥Þ¥¯¥í̾¤Ï ISO C 99 ¤Î 7.8.1 Àá¤Ë°ìÍ÷¤¬¤¢¤ê¤Þ¤¹."
 
-#: src/format-c.c:589
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '<' ¤Î¸å¤Î¥È¡¼¥¯¥ó¤Î¸å¤Ë '>' ¤¬Íè¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-c.c:815
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "ʸ»úÎó¤Ï°ú¿ôÈÖ¹æ %u ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¤¬°ú¿ôÈÖ¹æ %u ¤ò̵»ë¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-c.c:902 src/format-csharp.c:207 src/format-python.c:502
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "`msgid' ¤È `%s' ¤Ç»ØÄꤷ¤¿·Á¼°¤Î¿ô¤¬¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '{' ¤Î¸å¤Ë°ú¿ô¤Î¿ô¤¬Íè¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ',' ¤Î¸å¤Ë¿ô»ú¤¬Íè¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-csharp.c:131 src/format-java.c:192
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "ʸ»úÎó¤ÏÌ¿Îá¤ÎÅÓÃæ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤¹: '{' ¤È '}' ¤¬°ìÃפ·¤Æ¤¤¤Þ¤»¤ó."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤¬, '}' ¤ÎÂå¤ï¤ê¤ËÉÔÀµ¤Êʸ»ú '%c' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤¹."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤¬, '}' ¤ÎÂå¤ï¤ê¤ËÉÔÀµ¤Êʸ»ú¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤¹."
 
-#: src/format-csharp.c:162 src/format-java.c:347
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr "ʸ»úÎó¤ÏÌ¿Îá¤ÎÅÓÃ椫¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹: '}' ¤È '{' ¤¬°ìÃפ·¤Æ¤¤¤Þ¤»¤ó."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "ʸ»úÎó¤¬Ì¿ÎáÈÖ¹æ %u ¤Î¤¢¤È¤ËÊĤ¸¤Æ¤¤¤Ê¤¤ '}' ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹."
 
-#: src/format-gcc-internal.c:254
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ¤½¤Î¥Õ¥é¥°¤ÎÁȤ߹ç¤ï¤»¤Ï̵¸ú¤Ç¤¹."
 
-#: src/format-gcc-internal.c:291 src/format-gcc-internal.c:397
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '%c' ¤ÎÁ°¤ËÀºÅÙ¤¬Íè¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-gcc-internal.c:333
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ÀºÅ٤ΰú¿ôÃÍ¤Ï %u ¤ÈÅù¤·¤¯¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó."
 
-#: src/format-gcc-internal.c:405
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '%c' ¤ÎÁ°¤ËÀºÅÙ¤¬Íè¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó."
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ÀºÅÙ»ØÄê¤Ï̵¸ú¤Ç¤¹."
 
-#: src/format-gcc-internal.c:460
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '%c' ¤ÎÁ°¤Ë¥Õ¥é¥°¤¬Íè¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-gcc-internal.c:672
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "'msgid' ¤Ï %%m ¤Ï»È¤¤¤Þ¤¹¤¬ '%s' ¤Ï»È¤¤¤Þ¤»¤ó"
 
-#: src/format-gcc-internal.c:675
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' ¤Ï %%m ¤Ï»È¤¤¤Þ¤»¤ó¤¬ '%s' ¤Ï»È¤¤¤Þ¤¹"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "ʸ»úÎó¤¬Ì¿Îá¤ÎÅÓÃæ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤¹."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -421,64 +428,64 @@ msgstr ""
 "ʸ»úÎó¤Ï, ÈÖ¹æÉÕ¤±¤µ¤ì¤¿°ú¿ô¤â, ÈÖ¹æÉÕ¤±¤µ¤ì¤Æ¤¤¤Ê¤¤°ú¿ô¤â, ¤É¤Á¤é¤Î°ú¿ô¤â»²"
 "¾È¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, °ú¿ôÈÖ¹æ 0 ¤ÏÀµ¤ÎÀ°¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, Éý¤Î°ú¿ôÈÖ¹æ 0 ¤ÏÀµ¤ÎÀ°¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ÀºÅ٤ΰú¿ôÈÖ¹æ 0 ¤ÏÀµ¤ÎÀ°¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ʸ»ú '%c' ¤ÏÀµ¤·¤¤ÊÑ´¹µ­½Ò»Ò¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Î½ªÃ¼Ê¸»ú¤ÏÀµ¤·¤¤ÊÑ´¹µ­½Ò»Ò¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "ʸ»úÎó¤ÏÈó¸ß´¹¤ÊÊýË¡¤Ç°ú¿ôÈÖ¹æ %u ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, \"%s\" ¤ÏÀµ¤·¤¤ÆüÉÕ¤ä»þ¹ï¤Î·Á¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, \"%s\" ¤Î¸å¤Ë¥«¥ó¥Þ¤¬Íè¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, \"%s\" ¤ÏÀµ¤·¤¤¿ôÃͤηÁ¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -487,12 +494,12 @@ msgstr ""
 "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, °ú¿ô¤Î¿ô¤Î¸å¤Ë¥«¥ó¥Þ¤ä \"%s\", \"%s\", \"%s\", \"%s\" ¤ÎÃæ"
 "¤Î 1¤Ä¤¬Íè¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ÁªÂò»è¤Ë¿ôÃͤ¬¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -501,26 +508,26 @@ msgstr ""
 "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ÁªÂò»è¤Ë¿ôÃͤ¬¤¢¤ê, '<', '#' ¤ä '%s' ¤¬¤½¤Î¸å¤Ë¤¯¤ë¤³¤È¤Ï¤¢"
 "¤ê¤Þ¤»¤ó."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "°ú¿ô {%u} ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬ '%s' ¤Î¤è¤¦¤Ë 'msgid' ¤Ë¸ºß¤·¤Þ¤»¤ó"
 
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "°ú¿ô {%u} ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬ '%s' ¤Ë¸ºß¤·¤Þ¤»¤ó"
 
-#: src/format-java.c:776
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "'msgid' ¤È '%s' ¤Ç¤Î°ú¿ô {%u} ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬Ʊ¤¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/format-lisp.c:2338 src/format-lisp.c:2350 src/format-scheme.c:2364
-#: src/format-scheme.c:2376
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -529,7 +536,7 @@ msgstr ""
 "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ¥Ñ¥é¥á¡¼¥¿ %u ¤Ï '%s' ·¿¤Ç¤¹¤¬ '%s' ·¿¤Î¥Ñ¥é¥á¡¼¥¿¤ÏÁÛÄꤵ"
 "¤ì¤Æ¤¤¤Þ¤»¤ó."
 
-#: src/format-lisp.c:2373 src/format-scheme.c:2399
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -541,120 +548,122 @@ msgstr[0] ""
 "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, »ØÄꤵ¤ì¤¿¥Ñ¥é¥á¡¼¥¿¤¬Â¿¤¹¤®¤Þ¤¹: ¥Ñ¥é¥á¡¼¥¿¤ÏºÇÂç¤Ç¤â %u "
 "¸Ä¤Ç¤¹."
 
-#: src/format-lisp.c:2497 src/format-scheme.c:2500
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '%c' ¤Î¸å¤Ë¿ôÃͤ¬Íè¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-lisp.c:2737 src/format-scheme.c:2755
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, °ú¿ô %d ¤ÏÉé¤Ç¤¹."
 
-#: src/format-lisp.c:2806
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "ʸ»úÎó¤Ï ~/.../ Ì¿Îá¤ÎÅÓÃæ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤¹."
 
-#: src/format-lisp.c:2844 src/format-lisp.c:3109 src/format-lisp.c:3226
-#: src/format-lisp.c:3286 src/format-lisp.c:3398 src/format-scheme.c:2841
-#: src/format-scheme.c:3106 src/format-scheme.c:3223 src/format-scheme.c:3321
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "'~%c' ¤¬ '~%c' ¤Ë°ìÃפ·¤Æ¤¤¤Þ¤»¤ó."
 
-#: src/format-lisp.c:2864 src/format-scheme.c:2861
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, @ ¤È : ¤ÎξÊý¤Î½¤¾þ»Ò¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹."
 
-#: src/format-lisp.c:2977 src/format-scheme.c:2974
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '~:[' ¤Î¸å¤Ë '~;' ¤Çʬ¤±¤é¤ì¤¿ 2¤Ä¤ÎÀ᤬¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-lisp.c:3327 src/format-scheme.c:3264
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '~;' ¤ÏÉÔÀµ¤Ê¾ì½ê¤Ç»È¤ï¤ì¤Æ¤¤¤Þ¤¹."
 
-#: src/format-lisp.c:3433 src/format-scheme.c:3356
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "ʸ»úÎó¤ÏÈó¸ß´¹¤ÊÊýË¡¤Ç°ú¿ô¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-lisp.c:3475 src/format-scheme.c:3398
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "`msgid' ¤È `%s' ¤Ç¤Î·Á¼°¤Î»ØÄ꤬Åù¤·¤¯¤¢¤ê¤Þ¤»¤ó"
 
-#: src/format-lisp.c:3491 src/format-scheme.c:3414
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "'%s' ¤Ç¤Î·Á¼°¤Î»ØÄ꤬ 'msgid' ¤Ç¤Î¥µ¥Ö¥»¥Ã¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ¥µ¥¤¥º»ØÄê¤ÏÊÑ´¹»ØÄê '%c' ¤È¸ß´¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-perl-brace.c:200 src/format-python.c:460 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "°ú¿ô '%s' ¤ËÂФ¹¤ë·Á¼°»ØÄ꤬ '%s' ¤Ë¸ºß¤·¤Þ¤»¤ó"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 "ʸ»úÎó¤Ï, ̾Á°¤Î¤¢¤ë°ú¿ô¤â, ̾Á°¤Ê¤·¤Î°ú¿ô¤â, ¤É¤Á¤é¤Î°ú¿ô¤â»²¾È¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-python.c:344
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "ʸ»úÎó¤ÏÈó¸ß´¹¤ÊÊýË¡¤Ç°ú¿ô̾ '%s' ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-python.c:420
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 "tuple"
 msgstr "'msgid' ¤Ç¤Î·Á¼°»ØÄê¤Ï¥Þ¥Ã¥Ô¥ó¥°¤Ç¤¹¤¬, '%s' ¤Ç¤Ï¥¿¥×¥ë (tuple) ¤Ç¤¹"
 
-#: src/format-python.c:427
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 "mapping"
 msgstr "'msgid' ¤Ç¤Î·Á¼°»ØÄê¤Ï¥¿¥×¥ë (tuple) ¤Ç¤¹¤¬, '%s' ¤Ç¤Ï¥Þ¥Ã¥Ô¥ó¥°¤Ç¤¹"
 
-#: src/format-python.c:450 src/format-sh.c:298
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "°ú¿ô '%s' ¤ËÂФ¹¤ë·Á¼°»ØÄ꤬ '%s' ¤Î¤è¤¦¤Ë 'msgid' ¤Ë¸ºß¤·¤Þ¤»¤ó"
 
-#: src/format-python.c:480
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr ""
 "°ú¿ô '%2$s' ¤ËÂФ¹¤ë 'msgid' ¤È '%1$s' ¤Ç¤Î·Á¼°»ØÄ꤬Ʊ¤¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/format-qt.c:81
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "%%%c ¤Ø¤ÎÊ£¿ô²ó¤Î»²¾È"
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "ʸ»úÎó¤Ï̾Á°¤¬¥¢¥¹¥­¡¼¤Ç¤Ê¤¤¥·¥§¥ëÊÑ¿ô¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -662,56 +671,49 @@ msgstr ""
 "ʸ»úÎó¤ÏÊ£»¨¤Ê¥·¥§¥ë³ç¸Ì¤Îʸˡ¤ò»È¤Ã¤¿¥·¥§¥ëÊÑ¿ô¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹. ¤³¤Îʸˡ¤Ï"
 "¤³¤³¤Ç¤Ï¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 "ʸ»úÎó¤Ï¥·¥§¥ë´Ø¿ôÆâ¤Ç°Û¤Ê¤ë²ÄǽÀ­¤Î¤¢¤ëÃͤò»ý¤Ã¤¿¥·¥§¥ëÊÑ¿ô¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "ʸ»úÎó¤Ï̾Á°¤¬¶õ¤Î¥·¥§¥ëÊÑ¿ô¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ʸ»ú '%c' ¤Ï 1 ¤«¤é 9 ¤Î´Ö¤Î¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Î½ªÃ¼Ê¸»ú¤Ï 1 ¤«¤é 9 ¤Î´Ö¤Î¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/hostname.c:179 src/msgattrib.c:326 src/msgcat.c:282 src/msgcmp.c:162
-#: src/msgcomm.c:269 src/msgconv.c:224 src/msgen.c:212 src/msgexec.c:179
-#: src/msgfilter.c:281 src/msgfmt.c:365 src/msggrep.c:399 src/msginit.c:258
-#: src/msgmerge.c:320 src/msgunfmt.c:251 src/msguniq.c:248
-#: src/recode-sr-latin.c:111 src/urlget.c:131 src/xgettext.c:509
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-"\n"
-"[»²¹ÍÌõ]\n"
-"¤³¤ì¤Ï¥Õ¥ê¡¼¡¦¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹. ¥³¥Ô¡¼¤Î¾ò·ï¤Ë¤Ä¤¤¤Æ¤Ï¥½¡¼¥¹¤ò¤ªÆɤߤ¯¤À¤µ¤¤.\n"
-"»Ô¾ìÀ­µÚ¤ÓÆÃÄêÌÜŪŬ¹çÀ­¤ÎÇ¡²¿¤Ë¤è¤é¤º, ¤¤¤«¤Ê¤ëÊݾڤ⤢¤ê¤Þ¤»¤ó.\n"
-"\n"
 
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
 #: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:263
-#: src/msgmerge.c:325 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:514
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "ºî¼Ô %s.\n"
@@ -719,26 +721,26 @@ msgstr "
 #. This is a proper name. See the gettext manual, section Names.
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
 #: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:263 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
 #: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:273 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
 
 #: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
 #: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:347
-#: src/msgmerge.c:446 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:730
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¤è¤ê¿¤¯¤Î¾ðÊó¤òÆÀ¤ë¤¿¤á¤Ë¤Ï `%s --help' ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/hostname.c:211 src/msginit.c:351 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]\n"
@@ -776,27 +778,27 @@ msgstr "  -i, --ip-address            
 
 #: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
 #: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:403
-#: src/msgmerge.c:563 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:880
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "¾ðÊó½ÐÎÏ:\n"
 
 #: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
 #: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:405
-#: src/msgmerge.c:565 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:882
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¤Æ½ªÎ»\n"
 
 #: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
 #: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:407
-#: src/msgmerge.c:567 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:884
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n"
@@ -807,9 +809,9 @@ msgstr "  -V, --version               
 #. bugs (typically your translation team's web or email address).
 #: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
 #: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:414
-#: src/msgmerge.c:578 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:891
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï  ¤Þ¤Ç.\n"
 
@@ -818,8 +820,8 @@ msgstr "
 msgid "could not get host name"
 msgstr "¥Û¥¹¥È̾¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:151 src/msgfilter.c:211
-#: src/msggrep.c:419 src/msginit.c:196 src/msguniq.c:268
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "ºÇÂç 1¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬µö¤µ¤ì¤Þ¤¹"
@@ -828,9 +830,10 @@ msgstr "
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
 #: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
 #: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:350 src/msgmerge.c:371
-#: src/msgmerge.c:375 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:524 src/xgettext.c:528 src/xgettext.c:535
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ¤È %s ¤ÏÇØÈ¿¤Ç¤¹"
@@ -849,7 +852,7 @@ msgstr "°
 
 #: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
 #: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:361 src/msgmerge.c:467 src/msgunfmt.c:423
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
@@ -858,8 +861,8 @@ msgstr "Ĺ
 
 #: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
 #: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:364 src/msgmerge.c:470
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:748
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î»ØÄê:\n"
@@ -871,8 +874,8 @@ msgstr "  INPUTFILE                   
 
 #: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
 #: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:476 src/msguniq.c:336
-#: src/xgettext.c:754
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -888,21 +891,21 @@ msgstr ""
 
 #: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
 #: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:372 src/msgmerge.c:488 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:759
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î»ØÄê:\n"
 
 #: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
 #: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:490 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      »ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n"
 
 #: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:492
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -1012,21 +1015,21 @@ msgstr ""
 
 #: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
 #: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:380 src/msgmerge.c:525
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Îʸˡ:\n"
 
 #: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:382 src/msguniq.c:358
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï Java .properties ¤Îʸˡ\n"
 
 #: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:384 src/msguniq.c:360
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1037,15 +1040,15 @@ msgstr ""
 
 #: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
 #: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:387 src/msgmerge.c:533 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:838
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "½ÐÎϤξܺÙ:\n"
 
 #: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:535 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:840
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1053,8 +1056,8 @@ msgstr ""
 "  -e, --no-escape             ½ÐÎÏ¤Ë C ¸À¸ì¤Î¥¨¥¹¥±¡¼¥×¤ò»È¤ï¤Ê¤¤ (ɸ½à)\n"
 
 #: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:537 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:842
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1063,27 +1066,27 @@ msgstr ""
 "                              ³Èĥʸ»ú¤ò´Þ¤á¤Ê¤¤\n"
 
 #: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:539
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:844
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              ¶õ¤Ç¤¢¤Ã¤Æ¤â PO ¥Õ¥¡¥¤¥ë¤ò½ñ¤­½Ð¤¹\n"
 
 #: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:846
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                »ú²¼¤²·Á¼°¤Ç .po ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
 #: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:848
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: ¥Õ¥¡¥¤¥ë̾:¹ÔÈÖ¹æ' ¤Î¹Ô¤ò½ñ¤­½Ð¤µ¤Ê¤¤\n"
 
 #: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:850
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1091,7 +1094,7 @@ msgstr ""
 "  -n, --add-location          '#: ¥Õ¥¡¥¤¥ë̾:¹ÔÈÖ¹æ' ¤Î¹Ô¤òÀ¸À® (ɸ½à)\n"
 
 #: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:852
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1099,15 +1102,15 @@ msgstr ""
 "      --strict                ¸·Ì©¤Ê Uniforum ·Á¼°¤Î .po ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
 #: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:393
-#: src/msgmerge.c:549 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     Java .properties ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
 #: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:395
-#: src/msgmerge.c:551 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:856
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1115,15 +1118,15 @@ msgstr ""
 "      --stringtable-output    NeXTstep/GNUstep .strings ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
 #: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:397
-#: src/msgmerge.c:553 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:858
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          ½ÐÎÏ¥Ú¡¼¥¸¤ÎÉý¤òÀßÄê\n"
 
 #: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:399
-#: src/msgmerge.c:555 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:860
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1133,15 +1136,15 @@ msgstr ""
 "¤¤\n"
 
 #: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:558 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:863
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n"
 
 #: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:560 src/msguniq.c:395
-#: src/xgettext.c:865
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n"
@@ -1151,7 +1154,7 @@ msgstr "  -F, --sort-by-file          
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "»ØÄꤵ¤ì¤¿ÁªÂò´ð½à (%d < n < %d) ¤ÏÉÔ²Äǽ¤Ç¤¹"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:734
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [ÆþÎÏ¥Õ¥¡¥¤¥ë]...\n"
@@ -1179,18 +1182,18 @@ msgstr ""
 "¤¬ÄêµÁ¤µ¤ì¤¿ºÇ½é¤Î PO ¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤¬¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹. ¤Þ¤¿¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ\n"
 "¤ÏÁ´¤Æ¤Î PO ¥Õ¥¡¥¤¥ë¤«¤é¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:750
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               ÆþÎÏ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:752
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ò FILE ¤«¤é¼èÆÀ\n"
 
 #: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:756
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n"
@@ -1223,14 +1226,14 @@ msgstr ""
 "                              ¤Î¤ß¤òɽ¼¨\n"
 
 #: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:527
+#: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï Java .properties ¤Îʸˡ\n"
 
 #: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:529
+#: src/msgmerge.c:532
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1268,21 +1271,21 @@ msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:325
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:336
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgcmp.c:183 src/msgmerge.c:341
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "Àµ³Î¤Ë 2¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹"
 
-#: src/msgcmp.c:202 src/msgmerge.c:450
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] def.po ref.pot\n"
@@ -1315,12 +1318,12 @@ msgstr "  def.po                      
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     ¥½¡¼¥¹¤Ø¤Î»²¾È\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:516
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Áàºî»ØÄê:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:518
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1348,17 +1351,17 @@ msgstr "
 msgid "this message needs to be reviewed by the translator"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏËÝÌõ¼Ô¤Ë¤è¤ë¥ì¥Ó¥å¡¼¤¬É¬ÍפǤ¹"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1220
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤¹¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1223
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...¤·¤«¤·¤³¤ÎÄêµÁ¤¬»÷¤Æ¤¤¤Þ¤¹"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1251
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤¹¤¬ %s ¤Ç¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
@@ -1408,7 +1411,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      NUMBER ¤è¤ê¿¤¯ÄêµÁ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò½ÐÎÏ\n"
 "                              ÀßÄꤵ¤ì¤Ê¤¤¾ì¹ç¤Ïɸ½à¤Ç 1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:867
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1430,31 +1433,31 @@ msgstr "
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "ɸ½à¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ï¸½ºß¤Î¥í¡¼¥«¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç¤¹.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:541
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                »ú²¼¤²·Á¼°¤Î½ÐÎÏ\n"
 
 #: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:543
+#: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           '#: filename:line' ¤Î¹Ô¤ò½ÐÎϤ·¤Ê¤¤\n"
 
 #: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:545
+#: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          '#: filename:line' ¤Î¹Ô¤òÊÝ»ý (ɸ½à)\n"
 
 #: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:547
+#: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                ¸·Ì©¤Ê Uniforum ½ÐÎÏ·Á¼°\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:552
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
@@ -1634,18 +1637,18 @@ msgstr "%s 
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤¬½ªÎ»¥³¡¼¥É %d ¤Ç½ªÎ»"
 
-#: src/msgfmt.c:303
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s ¤Ø¤Î°ú¿ô¤Ïñ°ì¤Î¶èÀÚ¤êʸ»ú¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹"
 
-#: src/msgfmt.c:350
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "̵¸ú¤Ê¥¨¥ó¥Ç¥£¥¢¥ó: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:514
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1698,7 +1701,7 @@ msgstr "
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "¥Ð¥¤¥Ê¥ê¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤ò¸¶Ê¸¤ÎËÝÌõ¤Îµ­½Ò¤«¤éÀ¸À®.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:743
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1712,7 +1715,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             ÆþÎÏ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:482 src/msgunfmt.c:426 src/xgettext.c:791
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Áàºî¥â¡¼¥É:\n"
@@ -1764,7 +1767,7 @@ msgstr "      --qt                    Qt 
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                ¸·Ì©¤Ê Uniforum ¥â¡¼¥É¤òÍ­¸ú¤Ë\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:767
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n"
@@ -1852,7 +1855,7 @@ msgstr ""
 "-l ¤È -d ¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü¤Ç¤¹. .msg ¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë½ñ¤­\n"
 "½Ð¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:783
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î²ò¼á:\n"
@@ -1931,7 +1934,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            ËÝÌõ¤Ë´Ø¤¹¤ëÅý·×¾ðÊó¤òɽ¼¨\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:569 src/msgunfmt.c:515
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               ¿ÇÃÇ¥ì¥Ù¥ë¤ò¾å¤²¤ë\n"
@@ -1987,13 +1990,13 @@ msgstr "
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ·Ù¹ð: ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë¤¢¤¤¤Þ¤¤ (fuzzy) ¤ÊËÝÌõ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msggrep.c:256 src/po-lex.c:658 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:141
-#: src/x-c.c:416 src/x-csharp.c:160 src/x-elisp.c:147 src/x-glade.c:452
-#: src/x-java.c:173 src/x-librep.c:149 src/x-lisp.c:214 src/x-perl.c:228
-#: src/x-perl.c:303 src/x-perl.c:396 src/x-php.c:164 src/x-python.c:176
-#: src/x-rst.c:235 src/x-scheme.c:173 src/x-sh.c:157 src/x-smalltalk.c:93
-#: src/x-tcl.c:152 src/x-ycp.c:93
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ¤òÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
@@ -2109,7 +2112,7 @@ msgstr "      --sort-output           
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n"
 
-#: src/msginit.c:286
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2118,7 +2121,7 @@ msgstr ""
 "¤¢¤Ê¤¿¤Ï¸À¸ì¤Ë´Ø¤ï¤ê¤Î¤Ê¤¤´Ä¶­¤Ë¤¤¤Þ¤¹. ABOUT-NLS ¤Ëµ­½Ò¤µ¤ì¤¿¤è¤¦¤Ë\n"
 "´Ä¶­ÊÑ¿ô LANG ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤. ¤³¤ì¤ÇËÝÌõ¤ò¥Æ¥¹¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹.\n"
 
-#: src/msginit.c:310
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2129,24 +2132,24 @@ msgstr ""
 "--locale ¥ª¥×¥·¥ç¥ó¤Ç¥í¥«¡¼¥ë¤ò»ØÄꤹ¤ë¤«, --output-file ¥ª¥×¥·¥ç¥ó¤Ç\n"
 "½ÐÎϤ¹¤ë .po ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/msginit.c:336
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s ¤òÀ¸À®.\n"
 
-#: src/msginit.c:356
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "¿·¤·¤¤ PO ¥Õ¥¡¥¤¥ë¤òºîÀ®. ¥æ¡¼¥¶´Ä¶­¤«¤é¤ÎÃͤǥ᥿¾ðÊó¤ò½é´ü²½¤·¤Þ¤¹.\n"
 
-#: src/msginit.c:366
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INPUTFILE       ÆþÎϤ¹¤ë POT ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2156,12 +2159,12 @@ msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤¾ì¹ç¤Ï¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ç POT ¥Õ¥¡¥¤¥ë¤¬¸¡º÷\n"
 "¤µ¤ì¤Þ¤¹. ¤â¤·ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Ê¤é¤Ðɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n"
 
-#: src/msginit.c:374
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      »ØÄꤵ¤ì¤¿ PO ¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2171,18 +2174,18 @@ msgstr ""
 "¤Î\n"
 "¥í¥«¡¼¥ëÀßÄê¤Ë°Í¸¤·¤Þ¤¹. ¤â¤· - ¤Ê¤é¤Ð·ë²Ì¤Ïɸ½à½ÐÎϤ˽ÐÎϤµ¤ì¤Þ¤¹.\n"
 
-#: src/msginit.c:389
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          ÂоݤȤʤë¥í¥«¡¼¥ë¤òÀßÄê\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         PO ¥Õ¥¡¥¤¥ë¤¬¼«Æ°À¸À®¤µ¤ì¤ë¤È²¾Äê\n"
 
-#: src/msginit.c:451
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2190,12 +2193,12 @@ msgstr ""
 "1¤Ä°Ê¾å¤Î .pot ¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤Þ¤·¤¿.\n"
 "--input ¥ª¥×¥·¥ç¥ó¤ÇÆþÎϤ¹¤ë .pot ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/msginit.c:459 src/msginit.c:464
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆɤ߹þ¤ß¥¨¥é¡¼"
 
-#: src/msginit.c:472
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2203,14 +2206,14 @@ msgstr ""
 "¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë .pot ¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿.\n"
 "--input ¥ª¥×¥·¥ç¥ó¤ÇÆþÎϤ¹¤ë .pot ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/msginit.c:861 src/msginit.c:929 src/msginit.c:1089 src/msginit.c:1168
-#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
-#: src/read-tcl.c:127 src/write-resources.c:104
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¼ºÇÔ, ½ªÎ»¥³¡¼¥É %d"
 
-#: src/msginit.c:1054
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2227,28 +2230,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1443
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s ¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë±ÑÌõ"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "¸½ºß¤Îʸ»ú¥»¥Ã¥È \"%s\" ¤Ï²ÄÈÂÀ­¤Î¤¢¤ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "2¤Ä¤Î°Û¤Ê¤Ã¤¿Ê¸»ú¥»¥Ã¥È \"%s\" ¤È \"%s\" ¤¬ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë `%s' ¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-cat.c:207
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2257,20 +2260,20 @@ msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë `%2$s' Æâ¤Î¥É¥á¥¤¥ó \"%1$s\" ¤Ë¤Ïʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌÜ"
 "¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-cat.c:389 src/msgl-iconv.c:361
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "ÂоݤȤʤëʸ»ú¥»¥Ã¥È \"%s\" ¤Ï²ÄÈÂÀ­¤Î¤¢¤ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-cat.c:440 src/msgl-cat.c:446 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:2770
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: src/msgl-cat.c:441
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2279,7 +2282,7 @@ msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤Ï°Û¤Ê¤Ã¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¥á¥Ã¥»¡¼¥¸¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹.\n"
 "½ÐÎϤò UTF-8 ¤ËÊÑ´¹¤·¤Þ¤¹.\n"
 
-#: src/msgl-cat.c:447
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2293,7 +2296,7 @@ msgstr ""
 "Ê̤νÐÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òÁªÂò¤¹¤ë¾ì¹ç¤Ï --to-code ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ"
 "¤¤.\n"
 
-#: src/msgl-cat.c:486
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2308,7 +2311,7 @@ msgstr ""
 "¥½¡¼¥¹¥³¡¼¥É¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç, UTF-8 ¤Ç¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ë¤³¤È¤òÊݾڤ¹¤ë¤«\n"
 "¤É¤Á¤é¤«¤Ç¤¹.\n"
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2321,12 +2324,12 @@ msgstr ""
 "'%s' ¤Î½ÐÎϤÏÉÔÀµ³Î¤Ç¤¢¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹.\n"
 "²Äǽ¤Ê²óÈòºö:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- LC_ALL ¤ò¥¨¥ó¥³¡¼¥Ç¥£¥ó¥° %s ¤Î¥í¥«¡¼¥ë¤ËÀßÄê.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2337,7 +2340,7 @@ msgstr ""
 "  ¤½¤Î¸å '%s' ¤òŬÍÑ.\n"
 "  ¹¹¤Ë 'msgconv' ¤ò»È¤Ã¤Æ %s ¤ËÌ᤹.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2350,7 +2353,7 @@ msgstr ""
 "  ¤½¤Î¸å '%s' ¤òŬÍÑ.\n"
 "  ¹¹¤Ë 'msgconv' ¤ò»È¤Ã¤Æ %s ¤ËÌ᤹.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2361,73 +2364,73 @@ msgstr ""
 "'%s' ¤Î½ÐÎϤÏÉÔÀµ³Î¤Ç¤¢¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹.\n"
 "²Äǽ¤Ê²óÈòºö¤È¤·¤Æ¤Ï LC_ALL=C ¤ÈÀßÄꤷ¤Þ¤¹.\n"
 
-#: src/msgl-check.c:91
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "Ê£¿ôɽ¸½¤¬Éé¤ÎÃͤòÀ¸À®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:101
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu ¤Ç¤¹¤¬Ê£¿ôɽ¸½¤¬ %lu ¤ÈƱ¤¸ÄøÅÙ¤ÎÃͤòÀ¸À®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:142
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "Ê£¿ôɽ¸½¤¬¥¼¥í³ä¤ê¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "Ê£¿ôɽ¸½¤¬À°¿ô¤¢¤Õ¤ì¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "Ê£¿ôɽ¸½¤¬±é»»Îã³°, ¤ª¤½¤é¤¯¥¼¥í³ä¤ê¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:184
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "%s ¤Ë¤È¤Ã¤ÆÍ­¸ú¤Ê, ¼¡¤ò»È¤Ã¤Æ¤ß¤Æ¤¯¤À¤µ¤¤:"
 
-#: src/msgl-check.c:267 src/msgl-check.c:291
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤ËÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:269
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "¤·¤«¤·¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤Ë \"plural=EXPRESSION\" °À­¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-check.c:293
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "¤·¤«¤·¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤Ë \"nplurals=INTEGER\" °À­¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-check.c:329
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "ÉÔÀµ¤Ê nplurals ¤ÎÃÍ"
 
-#: src/msgl-check.c:351
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "ÉÔÀµ¤ÊÊ£¿ô (plural) ɽ¸½"
 
-#: src/msgl-check.c:381 src/msgl-check.c:397
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:383
+#: src/msgl-check.c:392
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï %lu ¸Ä¤À¤±Ê£¿ô·Á¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:399
+#: src/msgl-check.c:408
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï %lu ¸Ä¤ÎÊ£¿ô·Á¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:419
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2435,86 +2438,86 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤ÏÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹. ¤·¤«¤· \"Plural-Forms: "
 "nplurals=INTEGER; plural=EXPRESSION;\" ¤È¤¤¤¦¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-check.c:501
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "`msgid' ¤È `msgid_plural' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:509
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ¤È `msgstr[%u]' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:524
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' ¤È `msgstr' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:542
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "`msgid' ¤È `msgstr_plural' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:550
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ¤È `msgstr[%u]' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:565
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' ¤È `msgstr' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:577
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "Ê£¿ô·Á¤ÎÀ©¸æ¤Ï GNU gettext ¤Î³ÈÄ¥¤Ç¤¹"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr ¤Ë¤Ï¥­¡¼¥Ü¡¼¥É¥¢¥¯¥»¥ì¥ì¡¼¥¿¤Îµ­¹æ '%c' ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-check.c:629
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 "msgstr ¤Ë¤Ï¤¢¤Þ¤ê¤Ë¿¤¯¤Î¥­¡¼¥Ü¡¼¥É¥¢¥¯¥»¥ì¥ì¡¼¥¿¤Îµ­¹æ '%c' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:669
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "¥Ø¥Ã¥À¾ðÊó `%s' ¤¬¥Ø¥Ã¥À¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó\n"
 
-#: src/msgl-check.c:677
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "¥Ø¥Ã¥À¾ðÊó `%s' ¤Ï¹ÔƬ¤Ë¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó\n"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "¤¤¤¯¤Ä¤«¤Î¥Ø¥Ã¥À¾ðÊ󤬽é´üɸ½àÃͤΤޤޤǤ¹\n"
 
-#: src/msgl-check.c:704
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "¾ðÊó `%s' ¤¬½é´üɸ½àÃͤΤޤޤǤ¹\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: ÆþÎÏ¤Ï \"%s\" ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ë¤ª¤¤¤ÆÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: \"%s\" ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤«¤é \"%s\" ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ËÊÑ´¹¤¹¤ëºÝ¤Ë¥¨¥é¡¼¤¬"
 "ȯÀ¸¤·¤Þ¤·¤¿"
 
-#: src/msgl-iconv.c:269
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-iconv.c:291 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:618 src/xgettext.c:610
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2523,7 +2526,7 @@ msgstr ""
 "\"%s\" ¤«¤é \"%s\" ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¤¬,iconv"
 "() ¤Ï¤³¤ÎÊÑ´¹¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó."
 
-#: src/msgl-iconv.c:321
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2532,8 +2535,8 @@ msgstr ""
 "\"%s\" ¤«¤é \"%s\" ¤Ø¤ÎÊÑ´¹¤¬½ÅÊ£, ¤¤¤¯¤Ä¤«¤Î°Û¤Ê¤Ã¤¿ msgid ¤¬Åù¤·¤¯¤Ê¤Ã¤Æ¤¤"
 "¤Þ¤¹."
 
-#: src/msgl-iconv.c:327 src/recode-sr-latin.c:301 src/x-python.c:625
-#: src/xgettext.c:617
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2542,16 +2545,16 @@ msgstr ""
 "\"%s\" ¤«¤é \"%s\" ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹.¤³¤Î¥Ð¡¼"
 "¥¸¥ç¥ó¤Ï iconv() ¤Ê¤·¤Çºî¤é¤ì¤Æ¤¤¤Þ¤¹."
 
-#: src/msgmerge.c:358 src/msgmerge.c:364
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s ¤Ï %s ¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤Ç¤¹"
 
-#: src/msgmerge.c:418
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¥¿¥¤¥×"
 
-#: src/msgmerge.c:455
+#: src/msgmerge.c:458
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2573,17 +2576,17 @@ msgstr ""
 "»Ä¤µ¤ì¤Þ¤¹. Àµ³Î¤Ë°ìÃפ·¤Æ¤¤¤ë¸Ä½ê¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï, ¤¢¤¤¤Þ¤¤ (fuzzy)\n"
 "¸¡º÷¤ò»È¤¦¤È¤è¤êÎɤ¤·ë²Ì¤òÀ¸¤à¤Ç¤·¤ç¤¦. \n"
 
-#: src/msgmerge.c:472
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      ¸Å¤¤¥½¡¼¥¹¤ËÂФ¹¤ë»²¾ÈËÝÌõ\n"
 
-#: src/msgmerge.c:474
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     ¿·¤·¤¤¥½¡¼¥¹¤ËÂФ¹¤ë»²¾È\n"
 
-#: src/msgmerge.c:478
+#: src/msgmerge.c:481
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2592,7 +2595,7 @@ msgstr ""
 "  -C, --compendium=FILE       ¥á¥Ã¥»¡¼¥¸ËÝÌõ¤ÎÄɲÃʸ¸¥\n"
 "                              1²ó°Ê¾å»ØÄꤵ¤ì¤ë²ÄǽÀ­¤¢¤ê\n"
 
-#: src/msgmerge.c:484
+#: src/msgmerge.c:487
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2601,27 +2604,27 @@ msgstr ""
 "  -U, --update                def.po ¤ò¹¹¿·\n"
 "                              def.po ¤¬´û¤ËºÇ¿·ÈǤǤ¢¤ì¤Ð²¿¤â¤·¤Ê¤¤\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "¹¹¿·¥â¡¼¥É¤Ç¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgmerge.c:498
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "·ë²Ì¤Ï def.po ¤Ë½ñ¤­Ìᤵ¤ì¤Þ¤¹.\n"
 
-#: src/msgmerge.c:500
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        def.po ¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºîÀ®\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         Ä̾ï¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×ÀÜÈø¼­¤ò¾å½ñ¤­\n"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:507
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2641,7 +2644,7 @@ msgstr ""
 "¼°\n"
 "  simple, never   ¾ï¤Ëñ½ã·Á¼°¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºîÀ®\n"
 
-#: src/msgmerge.c:511
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2651,34 +2654,34 @@ msgstr ""
 "--suffix ¤ä´Ä¶­ÊÑ¿ô SIMPLE_BACKUP_SUFFIX ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð,\n"
 "¥Ð¥Ã¥¯¥¢¥Ã¥×ÀÜÈø¼­¤Ï `~' ¤Ç¤¹.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:523
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     ¤¢¤¤¤Þ¤¤¸¡º÷¤ò¹Ô¤ï¤Ê¤¤\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:525
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              ËÝÌõ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ÎÁ°¤Î msgid ¤ò»Ä¤¹\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       ¿Ê¹Ô¾õ¶·¤òɽ¼¨¤·¤Ê¤¤\n"
 
-#: src/msgmerge.c:1324
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÊ£¿ô·Á¤òÄêµÁ¤¹¤Ù¤­¤Ç¤¹"
 
-#: src/msgmerge.c:1347
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÊ£¿ô·Á¤òÄêµÁ¤¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgmerge.c:1685
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2687,7 +2690,7 @@ msgstr ""
 "%s %ld(Á°¤ÎÈÇ) + %ld(¿·ÈÇ) ¤òÆɤ߹þ¤ß (¥Þ¡¼¥¸ %ld, ¤¢¤¤¤Þ¤¤ %ld, ·çÍî %ld, ÇË"
 "´þ %ld).\n"
 
-#: src/msgmerge.c:1693
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " ´°Î».\n"
 
@@ -2829,12 +2832,12 @@ msgid ""
 msgstr ""
 "  -u, --unique                Í£°ì¤Î¥á¥Ã¥»¡¼¥¸¤Î¤ß¤òɽ¼¨¤·, ½ÅÊ£¤ò̵»ë\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr "<ɸ½àÆþÎÏ>"
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2843,7 +2846,7 @@ msgstr ""
 "ʸ»ú¥»¥Ã¥È \"%s\" ¤ÏÈÆÍѤΥ¨¥ó¥³¡¼¥Ç¥£¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó.\n"
 "¥æ¡¼¥¶¤Îʸ»ú¥»¥Ã¥È¤Ø¤Î¥á¥Ã¥»¡¼¥¸¤ÎÊÑ´¹¤Ï¤¦¤Þ¤¯Æ¯¤«¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2852,7 +2855,7 @@ msgstr ""
 "ʸ»ú¥»¥Ã¥È \"%s\" ¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Þ¤¹¤¬,\n"
 "iconv() ¤Ï \"%s\" ¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2860,15 +2863,15 @@ msgstr ""
 "GNU libiconv ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤«¤é GNU gettext ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ì¤Ð\n"
 "¤³¤ÎÌäÂê¤Ï²ò·è¤¹¤ë¤Ç¤·¤ç¤¦.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "¤È¤Ë¤«¤¯Â³¤±¤Þ¤¹¤¬, ʸˡ¥¨¥é¡¼¤òµ¯¤³¤¹¤Ç¤·¤ç¤¦."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "¤È¤Ë¤«¤¯Â³¤±¤Þ¤¹."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2877,7 +2880,7 @@ msgstr ""
 "ʸ»ú¥»¥Ã¥È \"%s\" ¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Þ¤¹.\n"
 "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï iconv() ̵¤·¤Çºî¤é¤ì¤Þ¤·¤¿.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2885,32 +2888,32 @@ msgstr ""
 "ʸ»ú¥»¥Ã¥È¤¬¥Ø¥Ã¥À¤Ë¤¢¤ê¤Þ¤»¤ó.\n"
 "¥æ¡¼¥¶¤Îʸ»ú¥»¥Ã¥È¤Ø¤Î¥á¥Ã¥»¡¼¥¸ÊÑ´¹¤¬µ¡Ç½¤·¤Þ¤»¤ó.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "°ì´Ó¤·¤Æ¤¤¤Ê¤¤ #~ ¤Î»ÈÍÑ"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "`msgstr[]' ¤Î¹à¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "`msgstr_plural' ¤Î¹à¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "`msgstr' ¤Î¹à¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "ºÇ½é¤ÎÊ£¿ô·Á¤ËÈó¥¼¥í¤Îº÷°ú¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "Ê£¿ô·Á¤Ë´Ö°ã¤Ã¤¿º÷°ú¤¬¤¢¤ê¤Þ¤¹"
@@ -2920,7 +2923,7 @@ msgstr "Ê£
 msgid "too many errors, aborting"
 msgstr "¥¨¥é¡¼¤¬Â¿²á¤®¤ë¤Î¤Ç, ½èÍý¤òÂǤÁÀÚ¤ê¤Þ¤¹"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:708 src/write-po.c:833
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ÉÔÀµ¤ÊÊ£¿ô¥Ð¥¤¥È¤Î¥·¡¼¥±¥ó¥¹"
@@ -2964,60 +2967,60 @@ msgstr "ʸ
 msgid "context separator  within string"
 msgstr "ʸ»úÎóÃæ¤Îʸ̮¥»¥Ñ¥ì¡¼¥¿ "
 
-#: src/read-catalog.c:328 src/xgettext.c:903
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥É¥á¥¤¥óÌ¿Îá¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¤è¤¦¤Ç¤¹"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "¥á¥Ã¥»¡¼¥¸¤¬Æó½Å¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "¤³¤ì¤ÏºÇ½é¤ÎÄêµÁ¤Î¾ì½ê¤Ç¤¹"
 
-#: src/read-mo.c:106 src/read-mo.c:127 src/read-mo.c:173 src/read-mo.c:200
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤¬Ã»¤¯ÀÚ¤ê¼Î¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹"
 
-#: src/read-mo.c:130
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ï½ªÃ¼¤¬ NUL ¤Ç¤Ê¤¤Ê¸»úÎó¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹"
 
-#: src/read-mo.c:166 src/read-mo.c:275
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ï GNU ¤Î .mo ·Á¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/read-mo.c:179
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ï %s ¤Ë½ªÃ¼¤¬ NUL ¤Ç¤Ê¤¤Ê¸»úÎó¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "·Ù¹ð: Unicode ʸ»ú¤ËÂФ¹¤ëÉÔÀµ¤Ê \\uxxxx ʸˡ"
 
-#: src/read-stringtable.c:803
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "·Ù¹ð: ʸ»úÎó¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "·Ù¹ð: ʸˡ¥¨¥é¡¼"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "·Ù¹ð: ¥­¡¼/ÃͤÎÁȤ˽ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/read-stringtable.c:940
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr "·Ù¹ð: ʸˡ¥¨¥é¡¼, ʸ»úÎó¤Î¸å¤Ë¤Ï ';'"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "·Ù¹ð: ʸˡ¥¨¥é¡¼, ʸ»úÎó¤Î¸å¤Ë¤Ï '=' ¤Þ¤¿¤Ï ';'"
 
@@ -3084,7 +3087,7 @@ msgstr ""
 msgid "error writing stdout"
 msgstr "ɸ½à½ÐÎϤ˽ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: src/write-catalog.c:127
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
@@ -3092,7 +3095,7 @@ msgstr ""
 "Ê£¿ô¤ÎËÝÌõ¥É¥á¥¤¥ó¤ò»ØÄꤵ¤ì¤¿½ÐÎÏ·Á¼°¤Çñ°ì¤Î¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ"
 "¤»¤ó. Âå¤ï¤ê¤Ë PO ¥Õ¥¡¥¤¥ë¤Îʸˡ¤ò»È¤Ã¤Æ¤ß¤Æ¤¯¤À¤µ¤¤."
 
-#: src/write-catalog.c:130
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
@@ -3100,7 +3103,7 @@ msgstr ""
 "Ê£¿ô¤ÎËÝÌõ¥É¥á¥¤¥ó¤ò»ØÄꤵ¤ì¤¿½ÐÎÏ·Á¼°¤Çñ°ì¤Î¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ"
 "¤»¤ó."
 
-#: src/write-catalog.c:163
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
@@ -3108,7 +3111,7 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤Ïʸ̮°Í¸¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹¤¬, ½ÐÎÏ·Á¼°¤Ï¤½¤ì¤é¤ò¼ÂÁõ¤·¤Æ"
 "¤¤¤Þ¤»¤ó."
 
-#: src/write-catalog.c:198
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3118,7 +3121,7 @@ msgstr ""
 "¤¤¤Þ¤»¤ó. °À­¥Õ¥¡¥¤¥ë¤ÎÂå¤ï¤ê¤Ë \"msgfmt --java\" ¤ò»È¤Ã¤Æ Java ¥¯¥é¥¹¤òÀ¸À®"
 "¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤."
 
-#: src/write-catalog.c:203
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3126,58 +3129,53 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤ÏÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹¤¬, ½ÐÎÏ·Á¼°¤Ï¤½¤ì¤é¤ò¼ÂÁõ¤·¤Æ¤¤"
 "¤Þ¤»¤ó."
 
-#: src/write-catalog.c:230 src/write-catalog.c:274
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë \"%s\" ¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: src/write-catalog.c:238 src/write-catalog.c:282
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "ɸ½à½ÐÎÏ"
 
-#: src/write-csharp.c:611
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤Ïʸ̮¤Ë°Í¸¤·¤¿ËÝÌõ¤¬¤¢¤ê¤Þ¤¹.\n"
-"¤·¤«¤· C# .dll ·Á¼°¤Ïʸ̮¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó\n"
-
-#: src/write-csharp.c:678
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê \"%s\" ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: src/write-csharp.c:740
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. --verbose ¤ò»î¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: src/write-java.c:912
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤Ïʸ̮¤Ë°Í¸¤·¤¿ËÝÌõ¤¬¤¢¤ê¤Þ¤¹.\n"
-"¤·¤«¤· Java ResourceBundle ·Á¼°¤Ïʸ̮¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "C# ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. --verbose ¤ò»î¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: src/write-java.c:937
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "Àµ¤·¤¤ Java ¥¯¥é¥¹Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
-#: src/write-java.c:1021
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. --verbose ¤ò»î¤¹¤« $JAVAC ¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤"
 
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"Java ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. --verbose ¤ò»î¤¹¤« $JAVAC ¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" ¤Ë½ñ¤­¹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: src/write-po.c:767
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3185,7 +3183,7 @@ msgstr ""
 "¹ñºÝ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï `\\%c' ¤È¤¤¤¦¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤ò´Þ¤ó¤Ç¤Ï¤¤¤±¤Þ¤»"
 "¤ó"
 
-#: src/write-po.c:1213 src/write-po.c:1342
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3199,7 +3197,7 @@ msgstr ""
 "¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤.\n"
 "%s\n"
 
-#: src/write-po.c:1225 src/write-po.c:1354
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3213,7 +3211,7 @@ msgstr ""
 "¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤.\n"
 "%s\n"
 
-#: src/write-qt.c:668
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3221,7 +3219,7 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤ÏÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹.\n"
 "¤·¤«¤· Qt ¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°·Á¼°¤ÏÊ£¿ô·Á¤Î½èÍý¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/write-qt.c:694
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3233,7 +3231,7 @@ msgstr ""
 "Qt ¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°·Á¼°¤ÏËÝÌõʸ»úÎó¤Ç¤Î¤ß Unicode ¤ò¼ÂÁõ¤·, ¸µ¤Îʸ»úÎó\n"
 "¤Ç¤Ï¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó.\n"
 
-#: src/write-qt.c:718
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3244,12 +3242,12 @@ msgstr ""
 "Îó\n"
 "¤Ç¤Ï¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó.\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤Ø¤Î½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3257,7 +3255,7 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤Ïʸ̮°Í¸¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹.\n"
 "¤·¤«¤· C# .resources ·Á¼°¤Ïʸ̮¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3265,7 +3263,7 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤ÏÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹.\n"
 "¤·¤«¤· C# .resources ·Á¼°¤ÏÊ£¿ô·Á¤Î½èÍý¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3273,7 +3271,7 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤Ïʸ̮°Í¸¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹.\n"
 "¤·¤«¤· Tcl ¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°·Á¼°¤Ïʸ̮¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3281,27 +3279,27 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤ÏÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹.\n"
 "¤·¤«¤· Tcl ¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°·Á¼°¤ÏÊ£¿ô·Á¤Î½èÍý¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/x-awk.c:343 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: ·Ù¹ð: ʸ»úÎó¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-awk.c:594
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: ·Ù¹ð: Àµµ¬É½¸½¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-c.c:1155 src/x-csharp.c:1502 src/x-java.c:860
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: ·Ù¹ð: ʸ»úÄê¿ô¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-c.c:1179
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ·Ù¹ð: ʸ»úÎó¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-csharp.c:217 src/xgettext.c:1845
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3310,7 +3308,7 @@ msgstr ""
 "%s%s ¤ËÈó ASCII ʸ»úÎó.\n"
 "--from-code ¤ÇÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-csharp.c:264
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3319,7 +3317,7 @@ msgstr ""
 "%s:%d: ÉÔÀµ¤Ê¥Þ¥ë¥Á¥Ð¥¤¥È¥·¡¼¥±¥ó¥¹.\n"
 "--from-code ¤ÇÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-csharp.c:280
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3328,7 +3326,7 @@ msgstr ""
 "%s:%d: Ť¤ÉÔ´°Á´¤Ê¥Þ¥ë¥Á¥Ð¥¤¥È¥·¡¼¥±¥ó¥¹.\n"
 "--from-code ¤ÇÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-csharp.c:292
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3337,7 +3335,7 @@ msgstr ""
 "%s:%d: ¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤ËÉÔ´°Á´¤Ê¥Þ¥ë¥Á¥Ð¥¤¥È¥·¡¼¥±¥ó¥¹.\n"
 "--from-code ¤ÇÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-csharp.c:301
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3346,12 +3344,12 @@ msgstr ""
 "%s:%d: ¹ÔËö¤ËÉÔÀµ¤Ê¥Þ¥ë¥Á¥Ð¥¤¥È¥·¡¼¥±¥ó¥¹.\n"
 "--from-code ¤ÇÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-csharp.c:310 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv ¤Î¼ºÇÔ"
 
-#: src/x-csharp.c:333
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3360,32 +3358,32 @@ msgstr ""
 "%s:%d: ÉÔÀµ¤Ê¥Þ¥ë¥Á¥Ð¥¤¥È¥·¡¼¥±¥ó¥¹.\n"
 "--from-code ¤ÇÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-csharp.c:1383 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: ·Ù¹ð: ÉÔÀµ¤Ê Unicode ʸ»ú"
 
-#: src/x-csharp.c:1505 src/x-java.c:863
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: ·Ù¹ð: ʸ»úÎóÄê¿ô¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-csharp.c:2009 src/x-java.c:1357
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: ·Ù¹ð: '}' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë ')' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/x-csharp.c:2043 src/x-java.c:1391
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: ·Ù¹ð: ')' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë '}' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/x-glade.c:459 src/x-glade.c:466
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:493
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3394,47 +3392,47 @@ msgstr ""
 "\"glade\" ¸À¸ì¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó. %s ¤Ï expat ¤Ë°Í¸¤·¤Þ¤¹.\n"
 "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï expat ¤ò´Þ¤Þ¤º¤Ëºî¤é¤ì¤Þ¤·¤¿.\n"
 
-#: src/x-java.c:483
+#: src/x-java.c:492
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: ·Ù¹ð: ʸ»úÎó¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-perl.c:309
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: EOF ¤ÎÁ°¤Î¤É¤³¤Ë¤âʸ»úÎó½ªÃ¼ \"%s\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: src/x-perl.c:1035
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{HEXNUMBER} ¤Ë±¦³ç¸Ì¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-perl.c:1155
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: ÉÔÀµ¤ÊÊä´Ö (\"\\l\") 8bit ʸ»ú \"%c\""
 
-#: src/x-perl.c:1175
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: ÉÔÀµ¤ÊÊä´Ö (\"\\u\") 8bit ʸ»ú \"%c\""
 
-#: src/x-perl.c:1209
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: \"%c\" ¤ËÉÔÀµ¤ÊÊÑ¿ôÊä´Ö"
 
-#: src/x-perl.c:1222
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: ÉÔÀµ¤ÊÊä´Ö (\"\\L\") 8bit ʸ»ú \"%c\""
 
-#: src/x-perl.c:1239
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ÉÔÀµ¤ÊÊä´Ö (\"\\U\") 8bit ʸ»ú \"%c\""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3446,7 +3444,7 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3458,7 +3456,7 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3470,7 +3468,7 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3482,7 +3480,7 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3494,7 +3492,7 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3506,27 +3504,27 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "̤ÃΤΥ¨¥ó¥³¡¼¥Ç¥£¥ó¥° \"%s\". Âå¤ï¤ê¤Ë ASCII ¤È¤·¤Æ¿Ê¤á¤Þ¤¹."
 
-#: src/x-rst.c:110
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ÉÔÀµ¤Êʸ»úÎóÄêµÁ"
 
-#: src/x-rst.c:174
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # ¤Î¸å¤Ë¿ô»ú¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-rst.c:209
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ÉÔÀµ¤Êʸ»úÎóɽ¸½"
 
-#: src/x-sh.c:1076
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3535,27 +3533,27 @@ msgstr ""
 "%s:%lu: ·Ù¹ð: ʸˡ $\"...\" ¤Ï¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤Ç¿ä¾©¤µ¤ì¤Þ¤»¤ó. Âå¤ï¤ê¤Ë "
 "eval_gettext ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing ¤Ï½ÐÎÏÀ褬ɸ½à½ÐÎϤξì¹ç¤Ë¤Ï»È¤¨¤Þ¤»¤ó"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ¤Ï¸¡º÷¤¹¤ë¥­¡¼¥ï¡¼¥É¤¬¤Ê¤±¤ì¤ÐÆ°¤­¤Þ¤»¤ó"
 
-#: src/xgettext.c:687
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "·Ù¹ð: ¥Õ¥¡¥¤¥ë `%s' (³ÈÄ¥»Ò `%s') ¤Ï̤ÃΤηÁ¼°¤Ê¤Î¤Ç C ¸À¸ì¤ò»î¤·¤Þ¤¹"
 
-#: src/xgettext.c:738
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Í¿¤¨¤é¤ì¤¿ÆþÎÏ¥Õ¥¡¥¤¥ë¤«¤éËÝÌõ²Äǽ¤Êʸ»úÎó¤ò¼è¤ê½Ð¤·¤Þ¤¹.\n"
 
-#: src/xgettext.c:761
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3563,23 +3561,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME   ½ÐÎÏ¤Ë NAME.po ¤ò»ÈÍÑ (message.po ¤ÎÂå¤ï¤ê)\n"
 
-#: src/xgettext.c:763
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           »ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n"
 
-#: src/xgettext.c:765
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DIR        ¥Ç¥£¥ì¥¯¥È¥ê DIR ¤Ë¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¸À¸ì¤ÎÁªÂò:\n"
 
-#: src/xgettext.c:772
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3598,19 +3596,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ¤Îû½Ì·Á\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "ɸ½à¤Ç¸À¸ì¤ÏÆþÎÏ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ç¼±Ê̤µ¤ì¤Þ¤¹.\n"
 
-#: src/xgettext.c:785
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3619,22 +3617,22 @@ msgstr ""
 "      --from-code=NAME           ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°\n"
 "                                         (Python, Tcl, Glade °Ê³°)\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "ɸ½à¤Ç¤Ï, ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï ASCII ¤È²¾Äꤵ¤ì¤Þ¤¹.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         ¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤È¥á¥Ã¥»¡¼¥¸¤ò·ë¹ç\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  FILE.po ¤«¤é¤Î¹àÌܤÏÃê½Ð¤µ¤ì¤Ê¤¤\n"
 
-#: src/xgettext.c:797
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3643,17 +3641,17 @@ msgstr ""
 "  -c, --add-comments[=TAG]     TAG (¤Þ¤¿¤Ï¥­¡¼¥ï¡¼¥É¹Ô) ¤òÉÕ¤±¤Æ\n"
 "                               ¥³¥á¥ó¥ÈÉôʬ¤ò½ÐÎÏ¥Õ¥¡¥¤¥ë¤ËÆþ¤ì¤ë\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "¸À¸ì»ØÄꥪ¥×¥·¥ç¥ó:\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           Á´¤Æ¤Îʸ»úÎó¤òÃê½Ð\n"
 
-#: src/xgettext.c:805 src/xgettext.c:812
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3667,7 +3665,7 @@ msgstr ""
 "                                C#, awk. Tcl, Perl, PHP, GCC-source, Glade ¸À"
 "¸ì¤Î¤ß)\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3676,7 +3674,7 @@ msgstr ""
 "  -k, --keyword[=WORD]         µá¤á¤ë¥­¡¼¥ï¡¼¥É¤Î»ØÄê (WORD ¤¬»ØÄꤵ¤ì\n"
 "                               ¤Ê¤¤¾ì¹ç¤Ïɸ½à¤Î¥­¡¼¥ï¡¼¥É¤Ï»È¤ï¤ì¤Ê¤¤)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3687,7 +3685,7 @@ msgstr ""
 "¤¹¤ë\n"
 "                              Éղåե饰\n"
 
-#: src/xgettext.c:819
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3701,62 +3699,77 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC¥½¡¼¥¹ ¸À¸ì"
 "¤Î¤ß)\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ÆþÎϤµ¤ì¤¿ ANSI C ¥È¥é¥¤¥°¥é¥Õ¤òǧ¼±\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (C, C++, ObjectiveC ¸À¸ì¤Î¤ß)\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt ·Á¼°¤Îʸ»úÎó¤òǧ¼±\n"
 
-#: src/xgettext.c:829 src/xgettext.c:833
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ ¸À¸ì¤Î¤ß)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    Qt ·Á¼°¤Îʸ»úÎó¤òǧ¼±\n"
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost ·Á¼°¤Îʸ»úÎó¤òǧ¼±\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 ¤è¤ê¾ÜºÙ¤Ê¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Îǧ¼±·ë²Ì\n"
 
-#: src/xgettext.c:854
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     Java .properties ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/xgettext.c:869
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  Ãøºî¸¢ÊÝÍ­¼Ô¤ò½ÐÎϤÇÀßÄê\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          ¾¹ñ¤Î¥æ¡¼¥¶¸þ¤±¤Ë½ÐÎÏÃæ¤Î FSF Ãøºî¸¢¤ò¾Êά\n"
 
-#: src/xgettext.c:873
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --copyright-holder=STRING  Ãøºî¸¢ÊÝÍ­¼Ô¤ò½ÐÎϤÇÀßÄê\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  msgid ¤Î¥Ð¥°Êó¹ðÍÑ¥¢¥É¥ì¥¹¤òÀßÄê\n"
 
-#: src/xgettext.c:875
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3764,7 +3777,7 @@ msgid ""
 msgstr ""
 "  -m, --msgstr-prefix[=STRING]  msgstr ¹àÌܤÎÀÜƬ¼­¤Ë STRING ¤« \"\" ¤ò»ÈÍÑ\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3772,7 +3785,7 @@ msgid ""
 msgstr ""
 "  -M, --msgstr-suffix[=STRING]  msgstr ¹àÌܤÎÀÜÈø¼­¤Ë STRING ¤« \"\" ¤ò»ÈÍÑ\n"
 
-#: src/xgettext.c:1642
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3780,16 +3793,16 @@ msgid ""
 msgstr ""
 "--flag °ú¿ô¤Ï ::[pass-] ʸˡ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó: %s"
 
-#: src/xgettext.c:1741
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "ɸ½àÆþÎÏ"
 
-#: src/xgettext.c:1921 src/xgettext.c:1954 src/xgettext.c:2012
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: ·Ù¹ð: "
 
-#: src/xgettext.c:1924
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3798,7 +3811,7 @@ msgstr ""
 "¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Î°ÌÃ֤ǻȤï¤ì¤Æ¤¤¤Þ¤¹¤¬, %s ¤ÏÀµ¤·¤¤ %s ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó"
 "¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. Íýͳ: %s\n"
 
-#: src/xgettext.c:1925
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3807,7 +3820,7 @@ msgstr ""
 "¤½¤Î¤è¤¦¤ËÀë¸À¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬, '%s' ¤ÏÀµ¤·¤¤ %s ·Á¼°¤Îʸ»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. Íý"
 "ͳ: %s\n"
 
-#: src/xgettext.c:1956
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3820,7 +3833,7 @@ msgstr ""
 "̾Á°ÉÕ¤­°ú¿ô¤Î¤¢¤ë¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤ò»È¤¦¤³¤È, ³î¤Ä°ú¿ô¤ËÂФ·¤ÆÁÈ (tuple)\n"
 "¤ÎÂå¤ï¤ê¤Ë¥Þ¥Ã¥Ô¥ó¥°¤ò»È¤¦¤³¤È¤ò¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/xgettext.c:2014
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3830,27 +3843,27 @@ msgstr ""
 "gettxt(\"\") ¤Ï¥á¥¿¾ðÊó¤ÎÉÕ¤¤¤¿¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤òÊÖ¤·¤Þ¤¹¤¬\n"
 "¶õ¤Îʸ»úÎó¤ÏÊÖ¤·¤Þ¤»¤ó.\n"
 
-#: src/xgettext.c:2618
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "¥­¡¼¥ï¡¼¥É '%.*s' ¤ËÂФ¹¤ë°ú¿ô»ØÄ꤬ۣËæ¤Ç¤¹"
 
-#: src/xgettext.c:2645
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "·Ù¹ð: ¥­¡¼¥ï¡¼¥É '%.*s' ¤ËÂФ¹¤ëʸ̮¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/xgettext.c:2670
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "·Ù¹ð: ¥­¡¼¥ï¡¼¥É '%.*s' ¤ÎÊ£¿ô·Á°ú¿ô¤Ëʸ̮¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "ʸ̮¤¬Ã±¿ô·Ï¤ÈÊ£¿ô·Á¤Ç°ìÃפ·¤Þ¤»¤ó"
 
-#: src/xgettext.c:2771
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3862,7 +3875,7 @@ msgstr ""
 "¤¤.\n"
 "¤â¤·¤¯¤Ï, ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó --msgid-bugs-address ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/xgettext.c:2970
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "¸À¸ì `%s' ¤ÏÃΤê¤Þ¤»¤ó"
@@ -3870,3 +3883,39 @@ msgstr "
 #: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr "<̾Á°¤Ê¤·>"
+
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "%%%c ¤Ø¤ÎÊ£¿ô²ó¤Î»²¾È"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ "\n"
+#~ "[»²¹ÍÌõ]\n"
+#~ "¤³¤ì¤Ï¥Õ¥ê¡¼¡¦¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹. ¥³¥Ô¡¼¤Î¾ò·ï¤Ë¤Ä¤¤¤Æ¤Ï¥½¡¼¥¹¤ò¤ªÆɤߤ¯¤À¤µ"
+#~ "¤¤.\n"
+#~ "»Ô¾ìÀ­µÚ¤ÓÆÃÄêÌÜŪŬ¹çÀ­¤ÎÇ¡²¿¤Ë¤è¤é¤º, ¤¤¤«¤Ê¤ëÊݾڤ⤢¤ê¤Þ¤»¤ó.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤Ïʸ̮¤Ë°Í¸¤·¤¿ËÝÌõ¤¬¤¢¤ê¤Þ¤¹.\n"
+#~ "¤·¤«¤· C# .dll ·Á¼°¤Ïʸ̮¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤Ïʸ̮¤Ë°Í¸¤·¤¿ËÝÌõ¤¬¤¢¤ê¤Þ¤¹.\n"
+#~ "¤·¤«¤· Java ResourceBundle ·Á¼°¤Ïʸ̮¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó\n"
diff --git a/gettext-tools/po/ko.po b/gettext-tools/po/ko.po
index d6eba6c2b..ac769b14b 100644
--- a/gettext-tools/po/ko.po
+++ b/gettext-tools/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-05-15 02:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-06-13 21:37+0900\n"
 "Last-Translator: Changwoo Ryu \n"
 "Language-Team: Korean \n"
@@ -16,88 +16,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "`%2$s'¿¡ ´ëÇÑ ÀÎÀÚ `%1$s'ÀÌ(°¡) À߸øµÇ¾ú½À´Ï´Ù"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "`%2$s'¿¡ ´ëÇÑ ÀÎÀÚ `%1$s'ÀÌ(°¡) ¾Ö¸ÅÇÕ´Ï´Ù"
 
-#: gnulib-lib/argmatch.c:154
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "¿Ã¹Ù¸¥ ÀÎÀÚ´Â ´ÙÀ½°ú °°½À´Ï´Ù:"
 
-#: gnulib-lib/clean-temp.c:334
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "Àӽà µð·ºÅ丮°¡ ¾ø½À´Ï´Ù, $TMPDIR ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ"
 
-#: gnulib-lib/clean-temp.c:348
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "Ʋ \"%s\"À»(¸¦) ÀÌ¿ëÇØ Àӽà µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: gnulib-lib/clean-temp.c:444
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "Àӽà ÆÄÀÏ %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù"
 
-#: gnulib-lib/clean-temp.c:459
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "Àӽà µð·ºÅ丮 %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "¾²±â ¿À·ù"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:55 src/msggrep.c:245
-#: src/open-catalog.c:122 src/read-mo.c:253 src/read-tcl.c:125
-#: src/urlget.c:201 src/xgettext.c:1750 src/xgettext.c:1763
-#: src/xgettext.c:1773
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Àбâ À§ÇØ \"%s\"À»(¸¦) ¿©´Â µ¿¾È ¿À·ù ¹ß»ý"
 
-#: gnulib-lib/copy-file.c:74
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "¹é¾÷ ÆÄÀÏ \"%s\"À»(¸¦) ¾²±â À§ÇØ ¿­Áö ¸øÇß½À´Ï´Ù"
 
-#: gnulib-lib/copy-file.c:82 src/urlget.c:213
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "\"%s\" ÆÄÀÏÀ» Àд µ¿¾È ¿À·ù ¹ß»ý"
 
-#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:92
-#: gnulib-lib/copy-file.c:131
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "\"%s\" ÆÄÀÏÀ» ¾²´Â µ¿¾È ¿À·ù ¹ß»ý"
 
-#: gnulib-lib/copy-file.c:94 gnulib-lib/copy-file.c:133 src/urlget.c:223
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "\"%s\" ÆÄÀÏÀ» ÀÐÀº ÈÄ¿¡ ¿À·ù ¹ß»ý"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:840
-#: src/msginit.c:908 src/msginit.c:1068 src/msginit.c:1151
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen()ÀÌ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: gnulib-lib/csharpcomp.c:540
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C# ÄÄÆÄÀÏ·¯°¡ ¾ø½À´Ï´Ù.  pnetÀ» ¼³Ä¡ÇØ º¸½Ê½Ã¿À"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# °¡»ó±â°è°¡ ¾ø½À´Ï´Ù.  pnetÀ» ¼³Ä¡ÇØ º¸½Ê½Ã¿À"
@@ -106,121 +106,121 @@ msgstr "C# 
 msgid "Unknown system error"
 msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù"
 
-#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:261 gnulib-lib/execute.c:303
-#: gnulib-lib/pipe.c:230 gnulib-lib/pipe.c:348 gnulib-lib/pipe.c:408
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s ¼­ºêÇÁ·Î¼¼½º°¡ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s'Àº(´Â) ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: `%s' ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: À߸øµÈ ¿É¼Ç -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ºÎÀûÀýÇÑ ¿É¼Ç -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ÀÌ ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s'Àº(´Â) ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: gnulib-lib/javacomp.c:128 gnulib-lib/javacomp.c:142
-#: gnulib-lib/javacomp.c:158
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class¿¡ ´ëÇÑ source_version ÀÎÀÚ°¡ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: gnulib-lib/javacomp.c:173 gnulib-lib/javacomp.c:194
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class¿¡ ´ëÇÑ target_version ÀÎÀÚ°¡ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: gnulib-lib/javacomp.c:505 src/write-csharp.c:714 src/write-java.c:988
-#: src/write-java.c:1000
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\"À»(¸¦) ¸¸µå´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: gnulib-lib/javacomp.c:512 src/write-catalog.c:254 src/write-catalog.c:318
-#: src/write-csharp.c:723 src/write-java.c:1009 src/write-mo.c:812
-#: src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" ÆÄÀÏÀ» ¾²´Â µ¿¾È ¿À·ù ¹ß»ý"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "ÀÚ¹Ù ÄÄÆÄÀÏ·¯°¡ ¾ø½À´Ï´Ù.  gcj¸¦ ¼³Ä¡Çϰųª $JAVAC ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "ÀÚ¹Ù °¡»ó±â°è°¡ ¾ø½À´Ï´Ù.  gij¸¦ ¼³Ä¡Çϰųª $JAVAC ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:848 src/msginit.c:916
-#: src/msginit.c:1076
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s ¼­ºêÇÁ·Î¼¼½º ÀÔÃâ·Â ¿À·ù"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:39 src/msgl-check.c:452 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:436 libgettextpo/gettext-po.c:1245
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³µ½À´Ï´Ù"
 
-#: gnulib-lib/pipe.c:156 gnulib-lib/pipe.c:159 gnulib-lib/pipe.c:263
-#: gnulib-lib/pipe.c:266
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "ÆÄÀÌÇÁ¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
@@ -244,74 +244,74 @@ msgstr "
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:230
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandleÀÌ ¿À·ù ÄÚµå 0x%08x¹øÀ¸·Î ½ÇÆÐÇß½À´Ï´Ù"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle ½ÇÆÐ"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s ¼­ºêÇÁ·Î¼¼½º"
 
 # fatal signal ¹ø¿ª °³¼±
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s ¼­ºêÇÁ·Î¼¼½º°¡ Ä¡¸íÀûÀÎ ½Ã±×³Î %dÀ»(¸¦) ¹Þ¾Ò½À´Ï´Ù"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 "'msgid'¿Í´Â ´Þ¸®, '%s'Àº(´Â) ¿Ã¹Ù¸¥ %s Çü½Ä ¹®ÀÚ¿­ÀÌ ¾Æ´Õ´Ï´Ù. ÀÌÀ¯: %s"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:624 src/format-librep.c:313
-#: src/format-pascal.c:402 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:138 src/format-tcl.c:391 src/format-ycp.c:145
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "'%2$s' ¾È¿¡ ÀÖ´Â, ÀÎÀÚ %1$u¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù"
 
-#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:634 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
-#: src/format-qt.c:137 src/format-tcl.c:401 src/format-ycp.c:144
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "ÀÎÀÚ %u¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ '%s'¿¡ ¾ø½À´Ï´Ù"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:911
-#: src/format-elisp.c:379 src/format-gcc-internal.c:654
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
-#: src/format-php.c:381 src/format-python.c:511 src/format-tcl.c:421
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "'msgid'¿Í '%s'¿¡ ¾²ÀÎ ÀÎÀÚ %u¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ °°Áö ¾Ê½À´Ï´Ù"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Áö½ÃÀÚ %u¹øÀÌ |·Î ½ÃÀÛÇÏÁö¸¸ |·Î ³¡³ªÁö ¾Ê½À´Ï´Ù."
 
-#: src/format-c.c:182
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -320,102 +320,109 @@ msgstr ""
 "Áö½ÃÀÚ %u¹ø¿¡¼­, '<' µÚÀÇ ÅäÅ«ÀÌ Æ÷¸ËÀ» ÁöÁ¤ÇÏ´Â ¸ÅÅ©·Î À̸§ÀÌ ¾Æ´Õ´Ï´Ù. ¿Ã¹Ù"
 "¸¥ ¸ÅÅ©·Î À̸§Àº ISO C 99 ¼½¼Ç 7.8.1¿¡ ¿­°ÅµÇ¾î ÀÖ½À´Ï´Ù."
 
-#: src/format-c.c:589
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, '<' µÚÀÇ ÅäÅ« ´ÙÀ½¿¡ '>'°¡ ¿ÀÁö ¾Ê½À´Ï´Ù."
 
-#: src/format-c.c:815
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "¹®ÀÚ¿­ÀÌ ÀÎÀÚ ¹øÈ£  %uÀ»(¸¦) ÂüÁ¶ÇÏÁö¸¸ ÀÎÀÚ ¹øÈ£ %uÀ»(¸¦) ¹«½ÃÇÕ´Ï´Ù."
 
-#: src/format-c.c:902 src/format-csharp.c:207 src/format-python.c:502
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "'msgid'¿Í '%s'¿¡ ¾²ÀÎ ¼­½Ä ÁöÁ¤ÀÚÀÇ °³¼ö°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, '{' ´ÙÀ½¿¡ ÀÎÀÚ ¹øÈ£°¡ ¿ÀÁö ¾Ê½À´Ï´Ù."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, ¼ýÀÚ ´ÙÀ½¿¡ ','°¡ ¿ÀÁö ¾Ê½À´Ï´Ù."
 
-#: src/format-csharp.c:131 src/format-java.c:192
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 "¹®ÀÚ¿­ÀÌ Áö½ÃÀÚ Áß°£¿¡¼­ ³¡³³´Ï´Ù: ¦ÀÌ ¸Â´Â '}'°¡ ¾ø´Â '{'¸¦ ¹ß°ßÇß½À´Ï´Ù."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "Áö½ÃÀÚ %u¹øÀÌ '}'°¡ ¾Æ´Ï¶ó À߸øµÈ '%c' ¹®ÀÚ·Î ³¡³³´Ï´Ù."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Áö½ÃÀÚ %u¹øÀÌ '}'°¡ ¾Æ´Ï¶ó À߸øµÈ ¹®ÀÚ·Î ³¡³³´Ï´Ù."
 
-#: src/format-csharp.c:162 src/format-java.c:347
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 "Áö½ÃÀÚ Áß°£¿¡¼­ ¹®ÀÚ¿­ÀÌ ½ÃÀÛÇÕ´Ï´Ù: ¦ÀÌ ¸Â´Â '}'°¡ ¾ø´Â '{'¸¦ ¹ß°ßÇß½À´Ï´Ù."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "¹®ÀÚ¿­¿¡ Áö½ÃÀÚ %u¹ø µÚ¿¡ '}'°¡ µé¾î ÀÖ½À´Ï´Ù."
 
-#: src/format-gcc-internal.c:254
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, Ç÷¡±× Á¶ÇÕÀÌ À߸øµÇ¾ú½À´Ï´Ù."
 
-#: src/format-gcc-internal.c:291 src/format-gcc-internal.c:397
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, '%c' ¾Õ¿¡´Â À¯È¿¼ýÀÚ¸¦ ÁöÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/format-gcc-internal.c:333
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, À¯È¿¼ýÀÚ¿¡ ´ëÇØ ÀÎÀÚ °³¼ö°¡ %u¿Í(°ú) °°¾Æ¾ß ÇÕ´Ï´Ù."
 
-#: src/format-gcc-internal.c:405
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, '%c' ¾Õ¿¡´Â À¯È¿¼ýÀÚ¸¦ ÁöÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, À¯È¿¼ýÀÚ ÁöÁ¤ÀÌ À߸øµÇ¾ú½À´Ï´Ù."
 
-#: src/format-gcc-internal.c:460
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, '%c' ¾Õ¿¡´Â Ç÷¡±×¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/format-gcc-internal.c:672
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "'msgid'°¡ %%mÀ» »ç¿ëÇÏÁö¸¸ '%s'Àº(´Â) »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/format-gcc-internal.c:675
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "'msgid'°¡ %%mÀ» »ç¿ëÇÏÁö ¾ÊÁö¸¸ '%s'Àº(´Â) %%mÀ» »ç¿ëÇÕ´Ï´Ù"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Áö½ÃÀÚ Áß°£¿¡¼­ ¹®ÀÚ¿­ÀÌ ³¡³³´Ï´Ù."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -423,46 +430,46 @@ msgstr ""
 "¹®ÀÚ¿­ÀÌ ÀÎÀÚÀÇ Àý´ë ¹øÈ£¸¦ ÅëÇÑ ¹æ¹ý°ú À̸§¾øÀÌ ÁöÁ¤ÇÏ´Â ¹æ¹ý µÎ °¡Áö·Î ÀÎÀÚ"
 "¸¦ ÂüÁ¶ÇÕ´Ï´Ù."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, ÀÎÀÚ ¹øÈ£ 0ÀÌ 1 ÀÌ»óÀÇ Á¤¼ö°¡ ¾Æ´Õ´Ï´Ù."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, ³ÊºñÀÇ ÀÎÀÚ ¹øÈ£ 0ÀÌ 1 ÀÌ»óÀÇ Á¤¼ö°¡ ¾Æ´Õ´Ï´Ù."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, Á¤¹ÐµµÀÇ ÀÎÀÚ ¹øÈ£ 0ÀÌ 1 ÀÌ»óÀÇ Á¤¼ö°¡ ¾Æ´Õ´Ï´Ù."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, '%c' ¹®ÀÚ´Â ¿Ã¹Ù¸¥ º¯È¯ ÁöÁ¤ÀÚ°¡ ¾Æ´Õ´Ï´Ù."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr "Áö½ÃÀÚ %u¹øÀ» ³¡¸¶Ä¡´Â ¹®ÀÚ°¡ ¿Ã¹Ù¸¥ º¯È¯ ÁöÁ¤ÀÚ°¡ ¾Æ´Õ´Ï´Ù."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "¹®ÀÚ¿­¿¡¼­ ȣȯµÇÁö ¾Ê´Â ¹æ¹ýÀ¸·Î ÀÎÀÚ ¹øÈ£ %uÀ»(¸¦) ÂüÁ¶ÇÕ´Ï´Ù."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -470,19 +477,19 @@ msgid ""
 msgstr ""
 "Áö½ÃÀÚ %u¹ø¿¡¼­, ¼­ºê¹®ÀÚ¿­ \"%s\"Àº(´Â) ¿Ã¹Ù¸¥ ³¯Â¥/½Ã°¢ ½ºÅ¸ÀÏÀÌ ¾Æ´Õ´Ï´Ù."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, \"%s\" ´ÙÀ½¿¡ ½°Ç¥°¡ ¿ÀÁö ¾Ê½À´Ï´Ù."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 "Áö½ÃÀÚ %u¹ø¿¡¼­, ¼­ºê¹®ÀÚ¿­ \"%s\"Àº(´Â) ¿Ã¹Ù¸¥ ¼ýÀÚ ½ºÅ¸ÀÏÀÌ ¾Æ´Õ´Ï´Ù."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -491,12 +498,12 @@ msgstr ""
 "Áö½ÃÀÚ %u¹ø¿¡¼­, ÀÎÀÚ ¹øÈ£ ´ÙÀ½¿¡ ½°Ç¥¿Í \"%s\", \"%s\", \"%s\", \"%s\"ÁßÀÇ "
 "Çϳª°¡ ¿ÀÁö ¾Ê½À´Ï´Ù."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, ¼±Åà ÁöÁ¤¿¡ ¼ýÀÚ°¡ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -505,26 +512,26 @@ msgstr ""
 "Áö½ÃÀÚ %u¹ø¿¡¼­, ¼±Åà ÁöÁ¤¿¡ ¼ýÀÚ ´ÙÀ½¿¡ '<', '#', ȤÀº '%s'ÀÌ(°¡) ¿ÀÁö ¾Ê½À"
 "´Ï´Ù."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "'%2$s' ¾È¿¡ ÀÖ´Â, ÀÎÀÚ {%1$u}¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù"
 
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "ÀÎÀÚ {%u}¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ '%s'¿¡ ¾ø½À´Ï´Ù"
 
-#: src/format-java.c:776
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "ÀÎÀÚ {%2$u}¿¡ ´ëÇÑ 'msgid'¿Í '%1$s'ÀÇ ¼­½Ä ÁöÁ¤ÀÌ °°Áö ¾Ê½À´Ï´Ù"
 
-#: src/format-lisp.c:2338 src/format-lisp.c:2350 src/format-scheme.c:2364
-#: src/format-scheme.c:2376
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -532,7 +539,7 @@ msgid ""
 msgstr ""
 "Áö½ÃÀÚ %u¹ø¿¡¼­, ÆĶó¹ÌÅÍ %uÀº(´Â) '%s' ŸÀÔÀÌÁö¸¸, '%s' ŸÀÔÀ̾î¾ß ÇÕ´Ï´Ù."
 
-#: src/format-lisp.c:2373 src/format-scheme.c:2399
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -544,33 +551,33 @@ msgstr[0] ""
 "Áö½ÃÀÚ %u¹ø¿¡¼­, ¸Å°³º¯¼ö°¡ ³Ê¹« ¸¹½À´Ï´Ù; ÃÖ´ë %u°³ÀÇ ¸Å°³º¯¼ö¸¸ ¿Ã ¼ö ÀÖ½À"
 "´Ï´Ù."
 
-#: src/format-lisp.c:2497 src/format-scheme.c:2500
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, '%c' ´ÙÀ½¿¡ ¼ýÀÚ°¡ ¿ÀÁö ¾Ê½À´Ï´Ù."
 
-#: src/format-lisp.c:2737 src/format-scheme.c:2755
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, ÀÎÀÚ %dÀÌ(°¡) 0º¸´Ù ÀÛ½À´Ï´Ù."
 
-#: src/format-lisp.c:2806
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "¹®ÀÚ¿­ÀÌ ~/.../ Áö½ÃÀÚÀÇ Áß°£¿¡¼­ ³¡³³´Ï´Ù."
 
-#: src/format-lisp.c:2844 src/format-lisp.c:3109 src/format-lisp.c:3226
-#: src/format-lisp.c:3286 src/format-lisp.c:3398 src/format-scheme.c:2841
-#: src/format-scheme.c:3106 src/format-scheme.c:3223 src/format-scheme.c:3321
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "'~%c'¿¡ ¦ÀÌ ¸Â´Â '~%c'ÀÌ(°¡) ¾ø½À´Ï´Ù."
 
-#: src/format-lisp.c:2864 src/format-scheme.c:2861
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, @¿Í : º¯°æÀÚ°¡ ¸ðµÎ µé¾î ÀÖ½À´Ï´Ù."
 
-#: src/format-lisp.c:2977 src/format-scheme.c:2974
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -579,39 +586,39 @@ msgstr ""
 "Áö½ÃÀÚ %u¹ø¿¡¼­, '~:[' ´ÙÀ½¿¡ ¿Í¾ß ÇÏ´Â '~;'·Î ±¸ºÐµÈ µÎ °³ÀÇ ÀýÀÌ ¿ÀÁö ¾Ê½À"
 "´Ï´Ù."
 
-#: src/format-lisp.c:3327 src/format-scheme.c:3264
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, '~;'ÀÌ À߸øµÈ À§Ä¡¿¡ ¾²¿©Á³½À´Ï´Ù."
 
-#: src/format-lisp.c:3433 src/format-scheme.c:3356
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "¹®ÀÚ¿­ÀÌ È£È¯µÇÁö ¾Ê´Â ¹æ¹ýÀ¸·Î ÀÎÀÚ¸¦ ÂüÁ¶ÇÕ´Ï´Ù."
 
 # ¿©±â¼­ equivalent¿¡ ´ëÇÑ Çؼ®Àº?
-#: src/format-lisp.c:3475 src/format-scheme.c:3398
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "'msgid'¿Í '%s'ÀÇ ¼­½Ä ÁöÁ¤ÀÌ µ¿µîÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/format-lisp.c:3491 src/format-scheme.c:3414
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "'%s' ¾È¿¡ ÀÖ´Â ¼­½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù"
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, Å©±â ÁöÁ¤Àº '%c' º¯È¯ ÁöÁ¤°ú ȣȯµÇÁö ¾Ê½À´Ï´Ù."
 
-#: src/format-perl-brace.c:200 src/format-python.c:460 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "ÀÎÀÚ '%s'¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ '%s'¿¡ ¾ø½À´Ï´Ù"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -619,49 +626,51 @@ msgstr ""
 "¹®ÀÚ¿­ÀÌ ÀÎÀÚ À̸§À» ÅëÇÑ ¹æ¹ý°ú À̸§¾øÀÌ ÁöÁ¤ÇÏ´Â ¹æ¹ý µÎ °¡Áö·Î ÀÎÀÚ¸¦ ÂüÁ¶"
 "ÇÕ´Ï´Ù."
 
-#: src/format-python.c:344
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "¹®ÀÚ¿­ÀÌ È£È¯µÇÁö ¾Ê´Â ¹æ¹ýÀ¸·Î '%s'(ÀÌ)¶ó´Â À̸§ÀÇ ÀÎÀÚ¸¦ ÂüÁ¶ÇÕ´Ï´Ù."
 
 # mapping°ú tuple: python µ¥ÀÌŸ ±¸Á¶
-#: src/format-python.c:420
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 "tuple"
 msgstr "'msgid'ÀÇ ¼­½Ä ÁöÁ¤ÀÚ´Â ¸ÅÇÎÀÌ ÇÊ¿äÇѵ¥, '%s'¿¡´Â ÅÍÇÃÀÌ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: src/format-python.c:427
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 "mapping"
 msgstr "'msgid'ÀÇ ¼­½Ä ÁöÁ¤ÀÚ´Â ÅÍÇÃÀÌ ÇÊ¿äÇѵ¥, '%s'¿¡´Â ¸ÅÇÎÀÌ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: src/format-python.c:450 src/format-sh.c:298
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "'%2$s' ¾È¿¡ ÀÖ´Â, ÀÎÀÚ '%1$s'¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù"
 
-#: src/format-python.c:480
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "ÀÎÀÚ '%s'¿¡ ´ëÇÑ 'msgid'¿Í '%s'ÀÇ ¼­½Ä ÁöÁ¤ÀÌ °°Áö ¾Ê½À´Ï´Ù"
 
-#: src/format-qt.c:81
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "%%%cÀ»(¸¦) ¿©·¯ ¹ø ÂüÁ¶Çß½À´Ï´Ù."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "¹®ÀÚ¿­ÀÌ ASCII°¡ ¾Æ´Ñ À̸§À¸·Î ½© º¯¼ö¸¦ ÂüÁ¶ÇÕ´Ï´Ù."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -669,50 +678,48 @@ msgstr ""
 "¹®ÀÚ¿­ÀÌ º¹ÀâÇÑ ½© Áß°ýÈ£ ¹®¹ýÀ¸·Î ½© º¯¼ö¸¦ ÂüÁ¶ÇÕ´Ï´Ù. ÀÌ ¹®¹ýÀº º¸¾È»óÀÇ "
 "ÀÌÀ¯¶§¹®¿¡ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr "¹®ÀÚ¿­ÀÌ ½© ÇÔ¼ö ¾È¿¡¼­ ´Ù¸¦ ¼öµµ ÀÖ´Â ½© º¯¼ö¸¦ ÂüÁ¶ÇÕ´Ï´Ù."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "¹®ÀÚ¿­ÀÌ ºó À̸§ÀÇ ½© º¯¼ö¸¦ ÂüÁ¶ÇÕ´Ï´Ù."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr "Áö½ÃÀÚ %u¹ø¿¡¼­, ¹®ÀÚ '%c'ÀÌ(°¡) 1°ú 9 »çÀÌÀÇ ¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr "Áö½ÃÀÚ %u¹øÀ» ³¡¸¶Ä¡´Â ¹®ÀÚ°¡ 1°ú 9 »çÀÌÀÇ ¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù."
 
-#: src/hostname.c:179 src/msgattrib.c:326 src/msgcat.c:282 src/msgcmp.c:162
-#: src/msgcomm.c:269 src/msgconv.c:224 src/msgen.c:212 src/msgexec.c:179
-#: src/msgfilter.c:281 src/msgfmt.c:365 src/msggrep.c:399 src/msginit.c:258
-#: src/msgmerge.c:320 src/msgunfmt.c:251 src/msguniq.c:248
-#: src/recode-sr-latin.c:111 src/urlget.c:131 src/xgettext.c:509
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"ÀÌ ÇÁ·Î±×·¥Àº ÀÚÀ¯ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù.  º¹»ç Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ. »óÇ°¼º\n"
-"À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
 
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
 #: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:263
-#: src/msgmerge.c:325 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:514
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%sÀÌ(°¡) ¸¸µé¾ú½À´Ï´Ù.\n"
@@ -720,26 +727,26 @@ msgstr "%s
 #. This is a proper name. See the gettext manual, section Names.
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
 #: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:263 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
 #: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr "ºê·ç³ë ÇìÀ̺í (Bruno Haible)"
 
-#: src/hostname.c:194 src/msginit.c:273 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "Àμö°¡ ³Ê¹« ¸¹À½"
 
 #: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
 #: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:347
-#: src/msgmerge.c:446 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:730
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ.\n"
 
-#: src/hostname.c:211 src/msginit.c:351 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>]\n"
@@ -776,27 +783,27 @@ msgstr "  -i, --ip-address      ȣ
 
 #: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
 #: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:403
-#: src/msgmerge.c:563 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:880
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Á¤º¸ Ãâ·Â:\n"
 
 #: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
 #: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:405
-#: src/msgmerge.c:565 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:882
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ÀÌ µµ¿ò¸»À» º¸¿©ÁÖ°í ³¡³³´Ï´Ù\n"
 
 #: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
 #: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:407
-#: src/msgmerge.c:567 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:884
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n"
@@ -807,9 +814,9 @@ msgstr "  -V, --version               
 #. bugs (typically your translation team's web or email address).
 #: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
 #: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:414
-#: src/msgmerge.c:578 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:891
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "·Î ¹®Á¦Á¡À» ¾Ë·Á ÁֽʽÿÀ.\n"
 
@@ -818,8 +825,8 @@ msgstr "
 msgid "could not get host name"
 msgstr "È£½ºÆ®À̸§À» ¾Ë¾Æ³¾ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:151 src/msgfilter.c:211
-#: src/msggrep.c:419 src/msginit.c:196 src/msguniq.c:268
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "ÃÖ´ë ÇÑ °³ÀÇ ÀÔ·ÂÆÄÀϸ¸ÀÌ Çã¿ëµË´Ï´Ù"
@@ -828,9 +835,10 @@ msgstr "
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
 #: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
 #: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:350 src/msgmerge.c:371
-#: src/msgmerge.c:375 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:524 src/xgettext.c:528 src/xgettext.c:535
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s°ú(¿Í) %sÀº(´Â) ¼­·Î ¹èŸÀûÀÔ´Ï´Ù"
@@ -851,7 +859,7 @@ msgstr ""
 
 #: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
 #: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:361 src/msgmerge.c:467 src/msgunfmt.c:423
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
@@ -860,8 +868,8 @@ msgstr "
 
 #: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
 #: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:364 src/msgmerge.c:470
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:748
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "ÀÔ·Â ÆÄÀÏ À§Ä¡:\n"
@@ -873,8 +881,8 @@ msgstr "  <
 
 #: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
 #: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:476 src/msguniq.c:336
-#: src/xgettext.c:754
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -890,21 +898,21 @@ msgstr "
 
 #: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
 #: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:372 src/msgmerge.c:488 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:759
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "Ãâ·Â ÆÄÀÏ À§Ä¡:\n"
 
 #: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
 #: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:490 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=<ÆÄÀÏ>   ÁöÁ¤ÇÑ ÆÄÀÏ·Î Ãâ·ÂÇÕ´Ï´Ù\n"
 
 #: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:492
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -1020,14 +1028,14 @@ msgstr ""
 
 #: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
 #: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:380 src/msgmerge.c:525
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "ÀÔ·Â ÆÄÀÏ ¹®¹ý:\n"
 
 #: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:382 src/msguniq.c:358
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1036,7 +1044,7 @@ msgstr ""
 "´Ï´Ù\n"
 
 #: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:384 src/msguniq.c:360
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1047,15 +1055,15 @@ msgstr ""
 
 #: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
 #: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:387 src/msgmerge.c:533 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:838
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "Ãâ·Â »ó¼¼:\n"
 
 #: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:535 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:840
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1063,8 +1071,8 @@ msgstr ""
 "  -e, --no-escape             Ãâ·Â¿¡ C À̽ºÄÉÀÌÇÁ¸¦ ¾²Áö ¾Ê½À´Ï´Ù (±âº»°ª)\n"
 
 #: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:537 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:842
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1073,27 +1081,27 @@ msgstr ""
 "½À´Ï´Ù\n"
 
 #: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:539
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:844
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              ºñ¾î ÀÖ´Â ÆÄÀÏÀÌ¶óµµ PO ÆÄÀÏ·Î ¾¹´Ï´Ù\n"
 
 #: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:846
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                µé¿©¾²±âµÈ ½ºÅ¸ÀÏ·Î .po ÆÄÀÏÀ» ¾¹´Ï´Ù\n"
 
 #: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:848
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: ÆÄÀÏÀ̸§:ÁÙ¹øÈ£' ÁÙÀ» ¾²Áö ¾Ê½À´Ï´Ù\n"
 
 #: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:850
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1101,7 +1109,7 @@ msgstr ""
 "  -n, --add-location          '#: ÆÄÀÏÀ̸§:ÁÙ¹øÈ£' ÁÙÀ» ¸¸µì´Ï´Ù (±âº»°ª)\n"
 
 #: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:852
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1109,15 +1117,15 @@ msgstr ""
 "      --strict                ¾ö°ÝÇÏ°Ô À¯´ÏÆ÷·³À» µû¸£´Â .po ÆÄÀÏÀ» ¾¹´Ï´Ù\n"
 
 #: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:393
-#: src/msgmerge.c:549 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     ÀÚ¹Ù .properties ÆÄÀÏÀ» ¾¹´Ï´Ù\n"
 
 #: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:395
-#: src/msgmerge.c:551 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:856
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1125,15 +1133,15 @@ msgstr ""
 "      --stringtable-input      NeXTstep/GNUstep .strings ÆÄÀÏÀ» ¾¹´Ï´Ù\n"
 
 #: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:397
-#: src/msgmerge.c:553 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:858
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=<¼ýÀÚ>          Ãâ·Â ÆäÀÌÁöÀÇ ³Êºñ¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n"
 
 #: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:399
-#: src/msgmerge.c:555 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:860
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1143,15 +1151,15 @@ msgstr ""
 "                              ÀÚ¸£Áö ¾Ê½À´Ï´Ù.\n"
 
 #: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:558 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:863
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µé¾î ³À´Ï´Ù\n"
 
 #: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:560 src/msguniq.c:395
-#: src/xgettext.c:865
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          ÆÄÀÏ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n"
@@ -1161,7 +1169,7 @@ msgstr "  -F, --sort-by-file          
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ºÒ°¡´ÉÇÑ ¼±Åà Á¶°ÇÀ» ÁöÁ¤ÇÏ¿´½À´Ï´Ù (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:734
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] [<ÀÔ·ÂÆÄÀÏ>]...\n"
@@ -1189,18 +1197,18 @@ msgstr ""
 "³ªÅ¸³ª´Â °¡Àå ù ¹ø° PO ÆÄÀÏ¿¡ µé¾î ÀÖ´Â  ¸ðµç PO ÆÄÀÏ¿¡¼­ ÆÄÀÏ \n"
 "À§Ä¡´Â ±×´ë·Î À¯ÁöµÉ °ÍÀÔ´Ï´Ù.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:750
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ÀÔ·ÂÆÄÀÏ ...                ÀÔ·Â ÆÄÀÏ\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:752
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=<ÆÄÀÏ>     ÀÔ·Â ÆÄÀÏÀÇ ¸ñ·ÏÀ» <ÆÄÀÏ>¿¡¼­ ÀнÀ´Ï´Ù\n"
 
 #: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:756
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "ÀÔ·Â ÆÄÀÏÀÌ -À̸é, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n"
@@ -1233,7 +1241,7 @@ msgstr ""
 "                              À¯ÀÏÇÑ ¸Þ¼¼Áö¸¸À» Ãâ·ÂÇÕ´Ï´Ù.\n"
 
 #: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:527
+#: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1242,7 +1250,7 @@ msgstr ""
 "´Ï´Ù\n"
 
 #: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:529
+#: src/msgmerge.c:532
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1280,21 +1288,21 @@ msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:325
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "ÇÇÅÍ ¹Ð·¯ (Peter Miller)"
 
-#: src/msgcmp.c:178 src/msgmerge.c:336
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: src/msgcmp.c:183 src/msgmerge.c:341
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "Á¤È®È÷ 2°³ÀÇ ÀÔ·Â ÆÄÀÏÀÌ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: src/msgcmp.c:202 src/msgmerge.c:450
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] def.po ref.pot\n"
@@ -1326,12 +1334,12 @@ msgstr "  def.po                      
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     ¼Ò½º¸¦ ÂüÁ¶\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:516
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "µ¿ÀÛ º¯°æ:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:518
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1360,17 +1368,17 @@ msgstr "
 msgid "this message needs to be reviewed by the translator"
 msgstr "ÀÌ ¸Þ¼¼Áö´Â ¹ø¿ªÀÚÀÇ °ËÅä°¡ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1220
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "ÀÌ ¸Þ½ÃÁö´Â »ç¿ëµÇÁö¸¸ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1223
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ÇÏÁö¸¸ ÀÌ Á¤ÀÇ´Â À¯»çÇÕ´Ï´Ù"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1251
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "ÀÌ ¸Þ½ÃÁö´Â »ç¿ëµÇÁö¸¸ %s¿¡¼­ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
@@ -1421,7 +1429,7 @@ msgstr ""
 "  ->, --more-than=<Å©±â>         ÁöÁ¤ÇÑ °Íº¸´Ù ¸¹Àº ¸Þ¼¼Áö¸¸À» Ãâ·ÂÇÕ´Ï´Ù.\n"
 "                                 ÀÌ ¿É¼ÇÀÌ ¾øÀ» °æ¿ì¿¡ ±âº»°ªÀº 1ÀÔ´Ï´Ù.\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:867
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1443,20 +1451,20 @@ msgstr "
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "±âº» ÀÎÄÚµùÀº ÇöÀç ·ÎÄÉÀÏÀÇ ÀÎÄÚµùÀÔ´Ï´Ù.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:541
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                   µé¿©¾²±âµÈ Ãâ·Â ÇüÅÂ\n"
 
 #: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:543
+#: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location              ''#: ÆÄÀÏÀ̸§:ÁÙ¹øÈ£' ÁÙÀ» ¾²Áö ¾Ê½À´Ï´Ù\n"
 
 #: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:545
+#: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1464,12 +1472,12 @@ msgstr ""
 "      --add-location          '#: filename:line' ÁÙÀ» ¸¸µì´Ï´Ù (±âº»°ª)\n"
 
 #: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:547
+#: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                   ¾ö°ÝÇÑ Uniforum Ãâ·Â ÇüÅ·Π¾¹´Ï´Ù\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:552
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
@@ -1653,18 +1661,18 @@ msgstr "%s 
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s ¼­ºêÇÁ·Î¼¼½º°¡ Á¾·áÄÚµå %d(À¸)·Î ³¡³µ½À´Ï´Ù"
 
-#: src/msgfmt.c:303
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%sÀÇ ÀÎÀÚ´Â ÇÑ °³ÀÇ ±¸µÎÁ¡ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù"
 
-#: src/msgfmt.c:350
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "¿£µð¾ÈÀÌ Æ²·È½À´Ï´Ù: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:514
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr "¿ï¸®È÷ µå·¹ÆÛ (Ulrich Drepper)"
 
@@ -1717,7 +1725,7 @@ msgstr "
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "ÁÖ¾îÁø ¹ø¿ª¹®¿¡¼­ ÀÌÁø ¸Þ¼¼Áö ¸ñ·Ï ÆÄÀÏÀ» ¸¸µé¾î ³À´Ï´Ù.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:743
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1731,7 +1739,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  <ÆÄÀÏÀ̸§>.po ...             ÀÔ·Â ÆÄÀÏ\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:482 src/msgunfmt.c:426 src/xgettext.c:791
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "µ¿ÀÛ ¸ðµå:\n"
@@ -1785,7 +1793,7 @@ msgstr "      --qt                    Qt 
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                   ¾ö°ÝÇÑ Uniforum Ãâ·Â ÇüÅ·Π¾¹´Ï´Ù\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:767
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Ãâ·Â ÆÄÀÏÀÌ -À̸é, Ãâ·ÂÀº Ç¥ÁØ Ãâ·Â¿¡ ¾¹´Ï´Ù.\n"
@@ -1867,7 +1875,7 @@ msgstr ""
 "-l°ú -d ¿É¼ÇÀº ²À ÇÊ¿äÇÕ´Ï´Ù.  .msg ÆÄÀÏÀº ÁöÁ¤ÇÑ µð·ºÅ丮¿¡\n"
 "¾¹´Ï´Ù.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:783
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "ÀÔ·Â ÆÄÀÏ Çؼ®:\n"
@@ -1948,7 +1956,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            ¹ø¿ª¿¡ ´ëÇÑ Åë°è¸¦ Ç¥½ÃÇÕ´Ï´Ù\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:569 src/msgunfmt.c:515
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               ´õ ÀÚ¼¼È÷ Ãâ·ÂÇÕ´Ï´Ù\n"
@@ -2005,13 +2013,13 @@ msgstr "
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù"
 
-#: src/msggrep.c:256 src/po-lex.c:658 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:141
-#: src/x-c.c:416 src/x-csharp.c:160 src/x-elisp.c:147 src/x-glade.c:452
-#: src/x-java.c:173 src/x-librep.c:149 src/x-lisp.c:214 src/x-perl.c:228
-#: src/x-perl.c:303 src/x-perl.c:396 src/x-php.c:164 src/x-python.c:176
-#: src/x-rst.c:235 src/x-scheme.c:173 src/x-sh.c:157 src/x-smalltalk.c:93
-#: src/x-tcl.c:152 src/x-ycp.c:93
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\"À»(¸¦) Àд µ¿¾È ¿À·ù ¹ß»ý"
@@ -2124,7 +2132,7 @@ msgstr "      --sort-output           
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n"
 
-#: src/msginit.c:286
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2134,7 +2142,7 @@ msgstr ""
 "¿©·¯ºÐÀÇ LANG ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ.  ¼¼ÆÃÇؾ߸¸ÀÌ ¿©·¯ºÐÀÇ\n"
 "¹ø¿ª¹®À» Å×½ºÆ®ÇÒ ¼ö ÀÖ½À´Ï´Ù.\n"
 
-#: src/msginit.c:310
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2145,12 +2153,12 @@ msgstr ""
 "--locale ¿É¼ÇÀ¸·Î ·ÎÄÉÀÏÀ» ÁöÁ¤Çϰųª --output-file ¿É¼ÇÀ¸·Î\n"
 "Ãâ·Â .po ÆÄÀÏÀ» ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/msginit.c:336
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "%sÀ»(¸¦) ¸¸µé¾ú½À´Ï´Ù.\n"
 
-#: src/msginit.c:356
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2159,12 +2167,12 @@ msgstr ""
 "»õ·Î¿î PO ÆÄÀÏÀ» ¸¸µé°í, »ç¿ëÀÚÀÇ È¯°æ¿¡¼­ ¸ÞŸ Á¤º¸µéÀ»\n"
 "ÃʱâÈ­ÇÕ´Ï´Ù\n"
 
-#: src/msginit.c:366
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=<ÀÔ·ÂÆÄÀÏ>       ÀÔ·Â POT ÆÄÀÏ\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2174,12 +2182,12 @@ msgstr ""
 "¸¸¾à ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾ÊÀ¸¸é, ÇöÀç µð·ºÅ丮¿¡¼­ POT ÆÄÀÏÀ» ã½À´Ï´Ù.\n"
 "ÀÔ·Â ÆÄÀÏÀÌ \"-\"À̸é, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n"
 
-#: src/msginit.c:374
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=<ÆÄÀÏ>    ÁöÁ¤ÇÑ PO ÆÄÀÏ·Î Ãâ·ÂÇÕ´Ï´Ù\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2188,19 +2196,19 @@ msgstr ""
 "¸¸¾à Ãâ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾ÊÀ¸¸é, --locale ¿É¼ÇÀ̳ª »ç¿ëÀÚÀÇ ·ÎÄÉÀÏ ¼¼Æÿ¡\n"
 "µû¶ó °áÁ¤µË´Ï´Ù.  Ãâ·Â ÆÄÀÏÀÌ \"-\"À̸é, Ç¥ÁØ Ãâ·Â¿¡ ¾¹´Ï´Ù.\n"
 
-#: src/msginit.c:389
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          ¸ñÇ¥ ·ÎÄÉÀÏÀ» ÁöÁ¤ÇÕ´Ï´Ù\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         PO ÆÄÀÏÀÌ ÀÚµ¿À¸·Î ¸¸µé¾îÁ³´Ù°í °¡Á¤ÇÕ´Ï´Ù\n"
 
-#: src/msginit.c:451
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2208,12 +2216,12 @@ msgstr ""
 "µÎ °³ ÀÌ»óÀÇ .pot ÆÄÀÏÀ» ã¾Ò½À´Ï´Ù.\n"
 "ÀÔ·Â .pot ÆÄÀÏÀ» --input ¿É¼ÇÀ¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/msginit.c:459 src/msginit.c:464
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "ÇöÀç µð·ºÅ丮¸¦ Àд µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù"
 
-#: src/msginit.c:472
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2221,14 +2229,14 @@ msgstr ""
 "ÇöÀç µð·ºÅ丮¿¡¼­ .pot ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù.\n"
 "--input ¿É¼ÇÀ¸·Î ÀÔ·Â .pot ÆÄÀÏÀ» ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/msginit.c:861 src/msginit.c:929 src/msginit.c:1089 src/msginit.c:1168
-#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
-#: src/read-tcl.c:127 src/write-resources.c:104
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s ¼­ºêÇÁ·Î¼¼½º°¡ Á¾·áÄÚµå %d(À¸)·Î ½ÇÆÐÇß½À´Ï´Ù"
 
-#: src/msginit.c:1054
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2244,28 +2252,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1443
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s ÆÐÅ°Áö¿¡ ´ëÇÑ Çѱ¹¾î ¹ø¿ª¹®"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "ÇöÀç ¹®Àڼ \"%s\"Àº(´Â) ³Î¸® ¾µ ¼ö ÀÖ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "ÀÔ·Â ÆÄÀÏ¿¡ µÎ °³ÀÇ ¹®Àڼ \"%s\"°ú(¿Í) \"%s\"ÀÌ(°¡) Á¸ÀçÇÕ´Ï´Ù"
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "ÀÔ·Â ÆÄÀÏ `%s'¿¡´Â ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-cat.c:207
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2274,19 +2282,19 @@ msgstr ""
 "ÀÔ·Â ÆÄÀÏ `%2$s'ÀÇ µµ¸ÞÀÎ \"%1$s\"¿¡´Â ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖ"
 "Áö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-cat.c:389 src/msgl-iconv.c:361
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "¸ñÇ¥ ¹®Àڼ \"%s\"Àº(´Â) ³Î¸® ¾µ ¼ö ÀÖ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù."
 
-#: src/msgl-cat.c:440 src/msgl-cat.c:446 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:2770
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "°æ°í: "
 
-#: src/msgl-cat.c:441
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2295,7 +2303,7 @@ msgstr ""
 "ÀÔ·Â ÆÄÀÏÀº ¿©·¯ °³ÀÇ ÀÎÄÚµùÀ¸·Î µÈ ¸Þ¼¼Áö°¡ µé¾î ÀÖ°í, ±× ÁßÀÇ Çϳª°¡ \n"
 "UTF-8ÀÔ´Ï´Ù.  Ãâ·ÂÀ» UTF-8À¸·Î º¯È¯ÇÕ´Ï´Ù.\n"
 
-#: src/msgl-cat.c:447
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2307,7 +2315,7 @@ msgstr ""
 "%sÀÌ(°¡) ÀÖ½À´Ï´Ù.  Ãâ·ÂÀ» UTF-8À¸·Î º¯È¯ÇÕ´Ï´Ù.\n"
 "´Ù¸¥ Ãâ·Â ÀÎÄÚµùÀ» ¼±ÅÃÇÏ·Á¸é, --to-code ¿É¼ÇÀ» ¾²¼¼¿ä.\n"
 
-#: src/msgl-cat.c:486
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2320,7 +2328,7 @@ msgstr ""
 "¸ðµç msgid¿Í msgctxt¸¦ ¼ø¼ö ASCII·Î ¹Ù²Ù°Å³ª, óÀ½ºÎÅÍ (¼Ò½ºÄÚµåºÎÅÍ) UTF-8\n"
 "ÀÎÄÚµùÀ¸·Î ¸¸µå½Ê½Ã¿À.\n"
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2333,12 +2341,12 @@ msgstr ""
 "'%s'·Î(À¸·Î) Ãâ·ÂÇÏ´Â °ÍÀÌ Æ²·ÈÀ» ¼ö ÀÖ½À´Ï´Ù.\n"
 "°¡´ÉÇÑ ÇØ°áÃ¥Àº:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- LC_ALL ȯ°æº¯¼ö¸¦ %s ÀÎÄÚµùÀ» ¾²´Â ·ÎÄÉÀÏ·Î ¼¼ÆÃÇϽʽÿÀ.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2349,7 +2357,7 @@ msgstr ""
 "  ±× ´ÙÀ½ '%s'À»(¸¦) Àû¿ëÇÏ°í,\n"
 "  ´Ù½Ã 'msgconv'¸¦ ÀÌ¿ëÇØ '%s'·Î(À¸·Î) º¯È¯ÇϽʽÿÀ\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2362,7 +2370,7 @@ msgstr ""
 "  ±× ´ÙÀ½ '%s'À»(¸¦) Àû¿ëÇÏ°í,\n"
 "  ´Ù½Ã 'msgconv'¸¦ ÀÌ¿ëÇØ '%s'·Î(À¸·Î) º¯È¯ÇϽʽÿÀ\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2373,24 +2381,24 @@ msgstr ""
 "'%s'·Î(À¸·Î) Ãâ·ÂÇÏ´Â °ÍÀÌ Æ²·ÈÀ» ¼ö ÀÖ½À´Ï´Ù.\n"
 "°¡´ÉÇÑ ÇØ°áÃ¥Àº \"LC_ALL=C\"·Î ¼¼ÆÃÇÏ´Â °ÍÀÔ´Ï´Ù.\n"
 
-#: src/msgl-check.c:91
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "º¹¼ö Ç¥Çö½ÄÀÌ À½¼ö °ªÀ» ¸¸µé ¼öµµ ÀÖ½À´Ï´Ù"
 
-#: src/msgl-check.c:101
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu ÇÏÁö¸¸ º¹¼ö Ç¥Çö½ÄÀÌ %lu¸¸Å­ Å« °ªÀ» ¸¸µé ¼öµµ ÀÖ½À´Ï´Ù"
 
-#: src/msgl-check.c:142
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "º¹¼ö Ç¥Çö½ÄÀÌ 0À¸·Î ³ª´©´Â ¿¬»êÀ» ÇÒ ¼öµµ ÀÖ½À´Ï´Ù"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "º¹¼ö Ç¥Çö½ÄÀÌ Á¤¼ö ¿À¹öÇ÷ο츦 ¹ß»ý½Ãų ¼ö ÀÖ½À´Ï´Ù"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2398,49 +2406,49 @@ msgstr ""
 "º¹¼ö Ç¥Çö½ÄÀÌ ¿¬»ê ¿¹¿Ü¸¦ ¹ß»ý½Ãų ¼ö ÀÖ½À´Ï´Ù.  0À¸·Î ³ª´©´Â ¿¬»êÀ» ÇÒ ¼ö ÀÖ"
 "½À´Ï´Ù"
 
-#: src/msgl-check.c:184
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "´ÙÀ½À» »ç¿ëÇØ º¸½Ê½Ã¿À.  %s¿¡ ´ëÇؼ­ ¿Ã¹Ù¸§:"
 
-#: src/msgl-check.c:267 src/msgl-check.c:291
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr "¸Þ¼¼Áö ¸ñ·ÏÀº º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖ½À´Ï´Ù"
 
-#: src/msgl-check.c:269
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ÇÏÁö¸¸ Çì´õ Ç׸ñ¿¡´Â \"plural=Ç¥Çö½Ä\" ¼Ó¼ºÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-check.c:293
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ÇÏÁö¸¸ Çì´õ Ç׸ñ¿¡´Â \"nplurals=Á¤¼ö\" ¼Ó¼ºÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-check.c:329
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "nplurals °ªÀÌ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: src/msgl-check.c:351
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "À߸øµÈ º¹¼ö Ç¥Çö½Ä"
 
-#: src/msgl-check.c:381 src/msgl-check.c:397
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:383
+#: src/msgl-check.c:392
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "ÇÏÁö¸¸ ¾î¶² ¸Þ¼¼Áö´Â %lu°³ÀÇ º¹¼ö Çü¹Û¿¡ ¾ø½À´Ï´Ù"
 
-#: src/msgl-check.c:399
+#: src/msgl-check.c:408
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "ÇÏÁö¸¸ ¾î¶² ¸Þ¼¼Áö´Â %lu°³ÀÇ º¹¼ö ÇüÀÌ ÀÖ½À´Ï´Ù"
 
-#: src/msgl-check.c:419
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2448,81 +2456,81 @@ msgstr ""
 "¸Þ¼¼Áö ¸ñ·Ï¿¡ º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸, Çì´õ Ç׸ñ¿¡ \"Plural-Forms: "
 "nplurals=Á¤¼ö; plural=Ç¥Çö½Ä;\"ÀÌ ¾ø½À´Ï´Ù"
 
-#: src/msgl-check.c:501
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid'¿Í `msgstr_plural' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-check.c:509
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid'¿Í `msgstr[%u]' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-check.c:524
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-check.c:542
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid'¿Í `msgid_plural' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-check.c:550
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid'¿Í `msgstr[%u]' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-check.c:565
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-check.c:577
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "º¹¼ö 󸮴 GNU gettext È®Àå ±â´ÉÀÔ´Ï´Ù"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr¿¡ Å°º¸µå ´ÜÃàÅ° '%c'¿¡ ´ëÇÑ Ç¥½Ã°¡ ¾ø½À´Ï´Ù"
 
-#: src/msgl-check.c:629
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr¿¡ Å°º¸µå ´ÜÃàÅ° '%c' Ç¥½Ã°¡ ³Ê¹« ¸¹½À´Ï´Ù"
 
-#: src/msgl-check.c:669
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "Çì´õ¿¡ Çì´õ Çʵå `%s'ÀÌ(°¡) ºüÁ³À½\n"
 
-#: src/msgl-check.c:677
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "Çì´õ Çʵå `%s'Àº(´Â) ÇàÀÇ Ã³À½ºÎÅÍ ½ÃÀÛÇØ¾ß ÇÕ´Ï´Ù\n"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "¸î¸î Çì´õ Çʵ尡 ¾ÆÁ÷µµ ÃʱâÀÇ ³»Á¤°ªÀ» °¡Áö°í ÀÖ½À´Ï´Ù\n"
 
-#: src/msgl-check.c:704
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "`%s' Çʵ尡 ¾ÆÁ÷µµ ÃʱâÀÇ ³»Á¤°ªÀ» °¡Áö°í ÀÖ½À´Ï´Ù\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: ÀÔ·ÂÀÌ \"%s\" ÀÎÄÚµù¿¡¼­ ¿Ã¹Ù¸£Áö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: \"%s\" ÀÎÄÚµù¿¡¼­ \"%s\" ÀÎÄÚµùÀ¸·Î º¯È¯ÇÏ´Â µ¿¾È ¿À·ù ¹ß»ý"
 
-#: src/msgl-iconv.c:269
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "ÀÔ·Â ÆÄÀÏÀº ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-iconv.c:291 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:618 src/xgettext.c:610
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2531,7 +2539,7 @@ msgstr ""
 "\"%s\"¿¡¼­ \"%s\"·Î(À¸·Î) º¯È¯ÇÒ ¼ö ¾ø½À´Ï´Ù.  %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö"
 "¸¸, iconv()°¡ ÀÌ°°Àº º¯È¯À» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: src/msgl-iconv.c:321
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2540,8 +2548,8 @@ msgstr ""
 "\"%s\"¿¡¼­ \"%s\"(À¸)·Î º¯È¯Çϸé Áߺ¹µË´Ï´Ù: ´Ù¸¥ µÎ °³ ÀÌ»óÀÇ msgid°¡ ¶È°°"
 "¾Æ Áý´Ï´Ù."
 
-#: src/msgl-iconv.c:327 src/recode-sr-latin.c:301 src/x-python.c:625
-#: src/xgettext.c:617
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2550,16 +2558,16 @@ msgstr ""
 "\"%s\"¿¡¼­ \"%s\"·Î(À¸·Î) º¯È¯ÇÒ ¼ö ¾ø½À´Ï´Ù. %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö¸¸, "
 "ÀÌ ¹öÀüÀº iconv()¸¦ Áö¿øµÇÁö ¾Ê´Â »óÅ·ΠºôµåµÇ¾ú½À´Ï´Ù."
 
-#: src/msgmerge.c:358 src/msgmerge.c:364
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%sÀº(´Â) %s°ú(¿Í) ÇÔ²² ½á¾ß¸¸ È¿°ú°¡ ÀÖ½À´Ï´Ù"
 
-#: src/msgmerge.c:418
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr "¹é¾÷ Á¾·ù"
 
-#: src/msgmerge.c:455
+#: src/msgmerge.c:458
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2582,17 +2590,17 @@ msgstr ""
 "º¸Á¸µË´Ï´Ù.  Á¤È®ÇÑ Â¦À» ãÁö ¸øÇÒ °æ¿ì, º¸´Ù ³ªÀº °á°ú¸¦ ¾ò±â À§ÇØ ÆÛÁö \n"
 "¸ÅĪÀÌ »ç¿ëµË´Ï´Ù.\n"
 
-#: src/msgmerge.c:472
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      °ú°Å ¼Ò½º¸¦ ÂüÁ¶ÇÏ´Â ¹ø¿ª¹®\n"
 
-#: src/msgmerge.c:474
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     »õ·Î¿î ¼Ò½º¸¦ ÂüÁ¶\n"
 
-#: src/msgmerge.c:478
+#: src/msgmerge.c:481
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2601,7 +2609,7 @@ msgstr ""
 "  -C, --compendium=<ÆÄÀÏ>      ¸Þ¼¼Áö ¹ø¿ª ¶óÀ̺귯¸® ´õÇϱâ,\n"
 "                               µÎ °³ ÀÌ»ó ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù\n"
 
-#: src/msgmerge.c:484
+#: src/msgmerge.c:487
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2611,28 +2619,28 @@ msgstr ""
 "                              ÀÌ¹Ì def.po°¡ °»½ÅµÇ¾î ÀÖ´Ù¸é ¾Æ¹« °Íµµ ¾È ÇÕ´Ï"
 "´Ù\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "¾÷µ¥ÀÌÆ® ¸ðµå¿¡¼­ Ãâ·Â ÆÄÀÏ À§Ä¡:\n"
 
-#: src/msgmerge.c:498
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "°á°ú¹°Àº def.poÆÄÀÏ·Î ´Ù½Ã ¾²¿©Áý´Ï´Ù.\n"
 
-#: src/msgmerge.c:500
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=<ÄÁÆ®·Ñ>       def.poÀÇ ¹é¾÷À» ¸¸µì´Ï´Ù\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=<Á¢¹Ì¾î>       ÀϹÝÀûÀÎ ¹é¾÷ Á¢¹Ì¾î ´ë½Å <Á¢¹Ì¾î>¸¦ ¾¹´Ï´Ù\n"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:507
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2651,7 +2659,7 @@ msgstr ""
 "È÷\n"
 "  simple, never   °£´ÜÇÑ ¹é¾÷¸¸À» ¸¸µì´Ï´Ù\n"
 
-#: src/msgmerge.c:511
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2661,34 +2669,34 @@ msgstr ""
 "--suffix ¿É¼ÇÀ̳ª SIMPLE_BACKUP_SUFFIX ȯ°æ º¯¼ö¸¦ ¼¼ÆÃÇÏÁö ¾Ê¾Ò´Ù¸é, ¹é¾÷ Á¢"
 "¹Ì¾î´Â '~'ÀÔ´Ï´Ù.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:523
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     ÆÛÁö ¸ÅĪÀ» ÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:525
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              ÀÌÀü¿¡ ¹ø¿ªÇÑ ¸Þ¼¼ÁöÀÇ msgid¸¦ ³ö µÓ´Ï´Ù\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       ÁøÇà»óÅ ǥ½Ã¸¦ ÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: src/msgmerge.c:1324
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ÀÌ ¸Þ½ÃÁö´Â º¹¼öÇüÀ» ÁöÁ¤Çؾ߸¸ ÇÕ´Ï´Ù"
 
-#: src/msgmerge.c:1347
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "ÀÌ ¸Þ½ÃÁö´Â º¹¼öÇüÀ» ÁöÁ¤Çؼ­´Â ¾È µË´Ï´Ù"
 
-#: src/msgmerge.c:1685
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2697,7 +2705,7 @@ msgstr ""
 "%s%ld°³ÀÇ ¿¹Àü °Í + %ld°³ÀÇ ÂüÁ¶¹®, °áÇÕµÈ °Í %ld, ÆÛÁö %ld, ºüÁø °Í %ld, ¾µ"
 "¸ð¾ø´Â °Í %ld°³¸¦ Àоú½À´Ï´Ù.\n"
 
-#: src/msgmerge.c:1693
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " ¿Ï·á.\n"
 
@@ -2839,12 +2847,12 @@ msgstr ""
 "  -u, --unique                   À¯ÀÏÇÑ ¸Þ¼¼Áö¸¸À» Ãâ·ÂÇÏ°í, Áߺ¹µÈ °ÍÀº ¹ö¸³"
 "´Ï´Ù\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr "<Ç¥ÁØÀÔ·Â>"
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2853,7 +2861,7 @@ msgstr ""
 "¹®Àڼ \"%s\"ÀÌ(°¡) °øÅëÀûÀ¸·Î ÀÌ¿ëÇÏ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù.\n"
 "»ç¿ëÀÚÀÇ ¹®ÀÚ¼ÂÀ¸·ÎÀÇ ¸Þ¼¼Áö º¯È¯Àº ÇÏÁö ¾ÊÀ» °ÍÀÔ´Ï´Ù.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2862,7 +2870,7 @@ msgstr ""
 "¹®Àڼ \"%s\"Àº(´Â) Áö¿øµÇÁö ¾Ê½À´Ï´Ù. %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö¸¸,\n"
 "iconv()´Â %sÀ»(¸¦) Áö¿øÇÏÁö ¾Ê½À´Ï´Ù.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2870,15 +2878,15 @@ msgstr ""
 "GNU libiconv¸¦ ¼³Ä¡ÇÏ°í GNU gettext¸¦ ´Ù½Ã ¼³Ä¡Çϸé ÀÌ\n"
 "¹®Á¦°¡ ¾øÀ» °ÍÀÔ´Ï´Ù.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "¾î·µç °è¼ÓÇÕ´Ï´Ù.  ¹®¹ý ¾Ö·¯°¡ Ÿ³ª³¯ °ÍÀÔ´Ï´Ù."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "¾î·µç °è¼ÓÇÕ´Ï´Ù."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2887,7 +2895,7 @@ msgstr ""
 "¹®Àڼ \"%s\"Àº(´Â) Áö¿øµÇÁö ¾Ê½À´Ï´Ù. %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö¸¸,\n"
 "ÀÌ ¹öÀüÀº iconv()¸¦ Áö¿øµÇÁö ¾Ê´Â »óÅ·ΠºôµåµÇ¾ú½À´Ï´Ù.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2895,32 +2903,32 @@ msgstr ""
 "Çì´õ¿¡ ¹®ÀÚ¼ÂÀÌ ¾ø½À´Ï´Ù\n"
 "»ç¿ëÀÚ ¹®ÀÚ¼ÂÀ¸·ÎÀÇ ¸Þ¼¼Áö º¯È¯Àº ÇÏÁö ¾Ê½À´Ï´Ù.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "#~°¡ ¸ð¼øµÇ°Ô ÀÌ¿ëµÇ¾ú½À´Ï´Ù"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "`msgstr[]' ºÎºÐÀÌ ºüÁ³½À´Ï´Ù"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "`msgstr_plural' ºÎºÐÀÌ ºüÁ³½À´Ï´Ù"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "`msgstr' ºÎºÐÀÌ ºüÁ³½À´Ï´Ù"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "ù ¹ø° º¹¼öÇüÀÇ À妽º°¡ 0ÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "º¹¼öÇüÀÇ À妽º°¡ À߸øµÇ¾ú½À´Ï´Ù"
@@ -2930,7 +2938,7 @@ msgstr "
 msgid "too many errors, aborting"
 msgstr "¿À·ù°¡ ³Ê¹« ¸¹¾Æ¼­ Áß´ÜÇÕ´Ï´Ù"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:708 src/write-po.c:833
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "À߸øµÈ °¡º¯¹ÙÀÌÆ® ¹®ÀÚ¿­"
@@ -2974,60 +2982,60 @@ msgstr "
 msgid "context separator  within string"
 msgstr "¹®ÀÚ¿­ ¾È¿¡ ÄÁÅؽºÆ® ±¸ºÐ °¡ ÀÖ½À´Ï´Ù."
 
-#: src/read-catalog.c:328 src/xgettext.c:903
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ÀÌ ÆÄÀÏÀº µµ¸ÞÀÎ Áö½ÃÀÚ¸¦ Æ÷ÇÔÇÏ°í ÀÖÁö ¾ÊÀ» ¼öµµ ÀÖ½À´Ï´Ù"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "Áߺ¹µÈ ¸Þ½ÃÁö Á¤ÀÇ"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "¿©±â´Â ù¹ø° Á¤ÀÇÀÇ À§Ä¡ÀÔ´Ï´Ù"
 
-#: src/read-mo.c:106 src/read-mo.c:127 src/read-mo.c:173 src/read-mo.c:200
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" ÆÄÀÏÀÌ À߷ȽÀ´Ï´Ù"
 
-#: src/read-mo.c:130
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "\"%s\" ÆÄÀÏ¿¡ NUL·Î ³¡³ªÁö ¾Ê´Â ¹®ÀÚ¿­ÀÌ ÀÖ½À´Ï´Ù"
 
-#: src/read-mo.c:166 src/read-mo.c:275
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" ÆÄÀÏÀº GNU .mo Çü½ÄÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: src/read-mo.c:179
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "\"%s\" ÆÄÀÏÀÇ %s À§Ä¡¿¡ NUL·Î ³¡³ªÁö ¾Ê´Â ¹®ÀÚ¿­ÀÌ ÀÖ½À´Ï´Ù"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "°æ°í:  À¯´ÏÄÚµå ¹®ÀÚ¿¡ \\uxxxx ¹®¹ýÀÌ Æ²·È½À´Ï´Ù"
 
-#: src/read-stringtable.c:803
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "°æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "°æ°í: ¹®¹ý ¿À·ù"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "°æ°í: Å°/°ª ½ÖÀÌ ¿Ï°áµÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: src/read-stringtable.c:940
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr "°æ°í: ¹®¹ý ¿À·ù, ¹®ÀÚ¿­ ´ÙÀ½¿¡ ';'ÀÌ ¿Í¾ß ÇÕ´Ï´Ù"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "°æ°í: ¹®¹ý ¿À·ù, ¹®ÀÚ¿­ ´ÙÀ½¿¡ '=' ȤÀº ';'ÀÌ ¿Í¾ß ÇÕ´Ï´Ù"
 
@@ -3090,7 +3098,7 @@ msgstr ""
 msgid "error writing stdout"
 msgstr "Ç¥ÁØ Ãâ·Â¿¡ ¾²´Â µ¿¾È ¿À·ù ¹ß»ý"
 
-#: src/write-catalog.c:127
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
@@ -3098,14 +3106,14 @@ msgstr ""
 "¿©·¯ °³ÀÇ ¹ø¿ª µµ¸ÞÀÎÀ» Ãâ·Â Çü½Ä¿¡ µû¶ó ÇÑ °³ÀÇ ÆÄÀÏ·Î Ãâ·ÂÇÒ ¼ö ¾ø½À´Ï´Ù. "
 "PO ÆÄÀÏ ¹®¹ýÀ» ½ÃµµÇØ º¸½Ê½Ã¿À."
 
-#: src/write-catalog.c:130
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 "¿©·¯ °³ÀÇ ¹ø¿ª µµ¸ÞÀÎÀ» Ãâ·Â Çü½Ä¿¡ µû¶ó ÇÑ °³ÀÇ ÆÄÀÏ·Î Ãâ·ÂÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/write-catalog.c:163
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
@@ -3113,7 +3121,7 @@ msgstr ""
 "¸Þ¼¼Áö ¸ñ·Ï¿¡ ÄÁÅؽºÆ® ÀÇÁ¸ ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸, Ãâ·Â Çü½ÄÀÌ ÄÁÅؽºÆ®¸¦ Áö¿øÇÏ"
 "Áö ¾Ê½À´Ï´Ù."
 
-#: src/write-catalog.c:198
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3122,7 +3130,7 @@ msgstr ""
 "¸Þ¼¼Áö ¸ñ·Ï¿¡ º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸, Ãâ·Â Çü½ÄÀÌ º¹¼öÇüÀ» Áö¿øÇÏÁö ¾Ê½À´Ï"
 "´Ù. properties ÆÄÀÏ ´ë½Å¿¡ \"msgfmt --java\"·Î Àڹ٠Ŭ·¡½º¸¦ ¸¸µé¾î º¸½Ê½Ã¿À."
 
-#: src/write-catalog.c:203
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3130,65 +3138,61 @@ msgstr ""
 "¸Þ¼¼Áö ¸ñ·Ï¿¡ º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸, Ãâ·Â Çü½ÄÀÌ º¹¼öÇüÀ» Áö¿øÇÏÁö ¾Ê½À´Ï"
 "´Ù."
 
-#: src/write-catalog.c:230 src/write-catalog.c:274
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "Ãâ·Â ÆÄÀÏ \"%s\"À»(¸¦) ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: src/write-catalog.c:238 src/write-catalog.c:282
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "Ç¥ÁØ Ãâ·Â"
 
-#: src/write-csharp.c:611
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"¸Þ¼¼Áö ¸ñ·Ï¿¡ ÄÁÅؽºÆ® ÀÇÁ¸ ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸,\n"
-"C# .dll Çü½ÄÀº ÄÁÅؽºÆ®¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
-
-#: src/write-csharp.c:678
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "\"%s\" µð·ºÅ丮¸¦ ¸¸µå´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: src/write-csharp.c:740
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# Ŭ·¡½º ÄÄÆÄÀÏ¿¡ ½ÇÆÐÇß½À´Ï´Ù.  --verbose·Î ½ÃµµÇØ º¸½Ê½Ã¿À"
 
-#: src/write-java.c:912
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"¸Þ¼¼Áö ¸ñ·Ï¿¡ ÄÁÅؽºÆ® ÀÇÁ¸ ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸,\n"
-"Java ResourceBundle Çü½ÄÀº ÄÁÅؽºÆ®¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "C# Ŭ·¡½º ÄÄÆÄÀÏ¿¡ ½ÇÆÐÇß½À´Ï´Ù.  --verbose·Î ½ÃµµÇØ º¸½Ê½Ã¿À"
 
-#: src/write-java.c:937
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "¿Ã¹Ù¸¥ Àڹ٠Ŭ·¡½º À̸§ÀÌ ¾Æ´Õ´Ï´Ù: %s"
 
-#: src/write-java.c:1021
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Àڹ٠Ŭ·¡½º ÄÄÆÄÀÏ¿¡ ½ÇÆÐÇß½À´Ï´Ù.  --verbose·Î ½ÃµµÇØ º¸°Å³ª $JAVAC ȯ°æº¯¼ö"
 "¸¦ ¼¼ÆÃÇϽʽÿÀ"
 
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"Àڹ٠Ŭ·¡½º ÄÄÆÄÀÏ¿¡ ½ÇÆÐÇß½À´Ï´Ù.  --verbose·Î ½ÃµµÇØ º¸°Å³ª $JAVAC ȯ°æº¯¼ö"
+"¸¦ ¼¼ÆÃÇϽʽÿÀ"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "¾²±â À§ÇØ \"%s\"À»(¸¦) ¿©´Â µ¿¾È ¿À·ù ¹ß»ý"
 
-#: src/write-po.c:767
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "±¹Á¦È­µÈ ¸Þ½ÃÁö´Â `\\%c' À̽ºÄÉÀÌÇÁ ¼ø¼­¿­À» Æ÷ÇÔÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/write-po.c:1213 src/write-po.c:1342
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3201,7 +3205,7 @@ msgstr ""
 "¹ß»ýÇÒ ¼ö ÀÖ½À´Ï´Ù.  ¼ø¼öÇÑ ASCII msgctxt¸¸À» »ç¿ëÇϵµ·Ï ÇϽʽÿÀ.\n"
 "%s\n"
 
-#: src/write-po.c:1225 src/write-po.c:1354
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3214,7 +3218,7 @@ msgstr ""
 "¹ß»ýÇÒ ¼ö ÀÖ½À´Ï´Ù.  ¼ø¼öÇÑ ASCII msgid¸¸À» »ç¿ëÇϵµ·Ï ÇϽʽÿÀ.\n"
 "%s\n"
 
-#: src/write-qt.c:668
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3222,7 +3226,7 @@ msgstr ""
 "¸Þ¼¼Áö ¸ñ·Ï¿¡ º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸, Qt ¸Þ¼¼Áö ¸ñ·ÏÀº º¹¼öÇüÀ» Áö¿øÇÏÁö "
 "¾Ê½À´Ï´Ù\n"
 
-#: src/write-qt.c:694
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3235,7 +3239,7 @@ msgstr ""
 "Áö\n"
 "¾Ê½À´Ï´Ù.\n"
 
-#: src/write-qt.c:718
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3247,12 +3251,12 @@ msgstr ""
 "¿øÇÏÁö\n"
 "¾Ê½À´Ï´Ù.\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "%s ÇÏÀ§ ÇÁ·Î¼¼½º¿¡ ¾²´Â µ¿¾È ¿À·ù ¹ß»ý"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3260,7 +3264,7 @@ msgstr ""
 "¸Þ¼¼Áö ¸ñ·Ï¿¡ ÄÁÅؽºÆ® ÀÇÁ¸ ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸,\n"
 "C# .resources Çü½ÄÀº ÄÁÅؽºÆ®¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3268,7 +3272,7 @@ msgstr ""
 "¸Þ¼¼Áö ¸ñ·Ï¿¡ º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸,\n"
 "C# .resource Çü½ÄÀº º¹¼öÇüÀ» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3276,7 +3280,7 @@ msgstr ""
 "¸Þ¼¼Áö ¸ñ·Ï¿¡ ÄÁÅؽºÆ® ÀÇÁ¸ ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸,\n"
 "Tcl ¸Þ¼¼Áö ¸ñ·Ï Çü½ÄÀº ÄÁÅؽºÆ®¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3284,27 +3288,27 @@ msgstr ""
 "¸Þ¼¼Áö ¸ñ·Ï¿¡ º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸, \n"
 "Tcl ¸Þ¼¼Áö ¸ñ·Ï Çü½ÄÀº º¹¼öÇüÀ» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: src/x-awk.c:343 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­"
 
-#: src/x-awk.c:594
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº Á¤±Ô½Ä"
 
-#: src/x-c.c:1155 src/x-csharp.c:1502 src/x-java.c:860
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ »ó¼ö"
 
-#: src/x-c.c:1179
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö"
 
-#: src/x-csharp.c:217 src/xgettext.c:1845
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3313,7 +3317,7 @@ msgstr ""
 "%s%s¿¡ ASCII°¡ ¾Æ´Ñ ¹®ÀÚ¿­ÀÌ ÀÖ½À´Ï´Ù.\n"
 "¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-csharp.c:264
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3322,7 +3326,7 @@ msgstr ""
 "%s:%d: À߸øµÈ ´ÙÁß¹ÙÀÌÆ® ½ÃÄö½º.\n"
 "¿Ã¹Ù¸¥ ¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-csharp.c:280
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3331,7 +3335,7 @@ msgstr ""
 "%s:%d: ±æ°í ºÒ¿ÏÀüÇÑ ´ÙÁß¹ÙÀÌÆ® ½ÃÄö½º.\n"
 "¿Ã¹Ù¸¥ ¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-csharp.c:292
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3340,7 +3344,7 @@ msgstr ""
 "%s:%d: ÆÄÀÏÀÇ ³¡¿¡ ºÒ¿ÏÀüÇÑ ´ÙÁß¹ÙÀÌÆ® ½ÃÄö½º.\n"
 "¿Ã¹Ù¸¥ ¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-csharp.c:301
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3349,12 +3353,12 @@ msgstr ""
 "%s:%d: ÁÙ ³¡¿¡ ºÒ¿ÏÀüÇÑ ´ÙÁß¹ÙÀÌÆ® ½ÃÄö½º.\n"
 "¿Ã¹Ù¸¥ ¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-csharp.c:310 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv ½ÇÆÐ"
 
-#: src/x-csharp.c:333
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3363,32 +3367,32 @@ msgstr ""
 "%s:%d: À߸øµÈ ´ÙÁß¹ÙÀÌÆ® ½ÃÄö½º.\n"
 "¿Ã¹Ù¸¥ ¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-csharp.c:1383 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: °æ°í: À߸øµÈ À¯´ÏÄÚµå ¹®ÀÚ"
 
-#: src/x-csharp.c:1505 src/x-java.c:863
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö"
 
-#: src/x-csharp.c:2009 src/x-java.c:1357
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: °æ°í: '}'°¡ ¿Í¾ß ÇÏ´Â °÷¿¡ ')'°¡ ¹ß°ßµÇ¾ú½À´Ï´Ù"
 
-#: src/x-csharp.c:2043 src/x-java.c:1391
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: °æ°í: ')°¡ ¿Í¾ß ÇÏ´Â °÷¿¡ '}'°¡ ¹ß°ßµÇ¾ú½À´Ï´Ù"
 
-#: src/x-glade.c:459 src/x-glade.c:466
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:493
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3397,48 +3401,48 @@ msgstr ""
 "¾ð¾î \"glade\"´Â Áö¿øµÇÁö ¾Ê½À´Ï´Ù. %sÀº(´Â) expat¿¡ ÀÇÁ¸ÇÕ´Ï´Ù.\n"
 "ÀÌ ¹öÀüÀº expat ¾øÀÌ ºôµåµÇ¾ú½À´Ï´Ù.\n"
 
-#: src/x-java.c:483
+#: src/x-java.c:492
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­"
 
-#: src/x-perl.c:309
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: ¹®ÀÚ¿­À» ³¡³»´Â \"%s\"ÀÌ(°¡) ÆÄÀÏÀÌ ³¡³ª±â Àü¿¡ ³ª¿ÀÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/x-perl.c:1035
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{½ÊÀ°Áø¼ö}¿¡¼­ ¿À¸¥ÂÊ Áß°ýÈ£°¡ ºüÁ³½À´Ï´Ù"
 
-#: src/x-perl.c:1155
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: 8ºñÆ® ¹®ÀÚ \"%c\"ÀÇ ÀÎÅÍÆú·¹À̼Ç(\"\\l\")ÀÌ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: src/x-perl.c:1175
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: 8ºñÆ® ¹®ÀÚ \"%c\"ÀÇ ÀÎÅÍÆú·¹À̼Ç(\"\\u\")ÀÌ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: src/x-perl.c:1209
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: \"%c\"¿¡¼­ º¯¼ö ÀÎÅÍÆú·¹À̼ÇÀÌ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: src/x-perl.c:1222
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: 8ºñÆ® ¹®ÀÚ \"%c\"ÀÇ ÀÎÅÍÆú·¹À̼Ç(\"\\L\")ÀÌ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: src/x-perl.c:1239
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8ºñÆ® ¹®ÀÚ \"%c\"ÀÇ ÀÎÅÍÆú·¹À̼Ç(\"\\U\")ÀÌ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3449,7 +3453,7 @@ msgstr ""
 "¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤Çϰųª http://www.python.org/peps/pep-"
 "0263.html ÆäÀÌÁö¿¡ ÀÖ´Â °Íó·³ ÁÖ¼®À¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3460,7 +3464,7 @@ msgstr ""
 "¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤Çϰųª http://www.python.org/peps/pep-"
 "0263.html ÆäÀÌÁö¿¡ ÀÖ´Â °Íó·³ ÁÖ¼®À¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3471,7 +3475,7 @@ msgstr ""
 "¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤Çϰųª http://www.python.org/peps/pep-"
 "0263.html ÆäÀÌÁö¿¡ ÀÖ´Â °Íó·³ ÁÖ¼®À¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3482,7 +3486,7 @@ msgstr ""
 "¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤Çϰųª http://www.python.org/peps/pep-"
 "0263.html ÆäÀÌÁö¿¡ ÀÖ´Â °Íó·³ ÁÖ¼®À¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3493,7 +3497,7 @@ msgstr ""
 "¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤Çϰųª http://www.python.org/peps/pep-"
 "0263.html ÆäÀÌÁö¿¡ ÀÖ´Â °Íó·³ ÁÖ¼®À¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3504,28 +3508,28 @@ msgstr ""
 "¼Ò½º ÀÎÄÚµùÀ» --from-code ¿É¼ÇÀ¸·Î ÁöÁ¤Çϰųª http://www.python.org/peps/pep-"
 "0263.html ÆäÀÌÁö¿¡ ÀÖ´Â °Íó·³ ÁÖ¼®À¸·Î ÁöÁ¤ÇϽʽÿÀ.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 "\"%s\" ÀÎÄÚµùÀº ¾î¶² ÀÎÄÚµùÀÎÁö ¾Ë ¼ö ¾ø½À´Ï´Ù. ´ë½Å ASCII·Î ÁøÇàÇÕ´Ï´Ù."
 
-#: src/x-rst.c:110
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: À߸øµÈ ¹®ÀÚ¿­ Á¤ÀÇ"
 
-#: src/x-rst.c:174
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # ´ÙÀ½¿¡ ¼ýÀÚ°¡ ºüÁ³½À´Ï´Ù"
 
-#: src/x-rst.c:209
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: À߸øµÈ ¹®ÀÚ¿­ Ç¥Çö"
 
-#: src/x-sh.c:1076
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3534,27 +3538,27 @@ msgstr ""
 "%s:%lu: °æ°í: $\"...\" ¹®¹ýÀº º¸¾È»óÀÇ ÀÌÀ¯·Î ¾ø¾îÁú ¿¹Á¤ÀÔ´Ï´Ù; ´ë½Å¿¡ "
 "eval_gettext¸¦ »ç¿ëÇϽʽÿÀ"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-exeistingÀº Ãâ·ÂÀÌ Ç¥ÁØÃâ·Â¿¡ ¾²¿©Áú ¶§ »ç¿ëµÉ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext´Â °Ë»öÇÒ Å°¿öµå ¾øÀÌ´Â µ¿ÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/xgettext.c:687
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "°æ°í: `%s' ÆÄÀÏÀÇ È®ÀåÀÚ `%s'À»(¸¦) ¾Ë ¼ö ¾ø½À´Ï´Ù; C Çü½ÄÀ¸·Î °£ÁÖÇÔ"
 
-#: src/xgettext.c:738
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "ÁÖ¾îÁø ÀÔ·Â ÆÄÀÏ¿¡¼­ ¹ø¿ª °¡´ÉÇÑ ¹®ÀÚ¿­À» »Ì¾Æ³À´Ï´Ù.\n"
 
-#: src/xgettext.c:761
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3563,24 +3567,24 @@ msgstr ""
 "  -d, --default-domain=<À̸§>    Ãâ·Â¿¡ (messages.po ´ë½Å) <À̸§>.po¸¦ ¾¹´Ï"
 "´Ù\n"
 
-#: src/xgettext.c:763
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=<ÆÄÀÏ>            ÁöÁ¤µÈ ÆÄÀÏ¿¡ Ãâ·ÂÇÕ´Ï´Ù\n"
 
-#: src/xgettext.c:765
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=<µð·ºÅ丮>    Ãâ·Â ÆÄÀÏÀ» <µð·ºÅ丮> µð·ºÅ丮¿¡ ³õ½À´Ï´Ù\n"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "ÀÔ·Â ÆÄÀÏÀÇ ¾ð¾î ¼±ÅÃ:\n"
 
-#: src/xgettext.c:772
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3599,12 +3603,12 @@ msgstr ""
 "PHP, \n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++¸¦ ª°Ô ¾´ °ÍÀÔ´Ï´Ù\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3612,7 +3616,7 @@ msgid ""
 msgstr ""
 "±âº»ÀûÀ¸·Î ÀÔ·Â ÆÄÀÏÀÇ È®ÀåÀÚ¿¡ µû¶ó ¾î¶² ¾ð¾î¸¦ »ç¿ëÇÒ Áö ÁüÀÛÇÕ´Ï´Ù.\n"
 
-#: src/xgettext.c:785
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3621,24 +3625,24 @@ msgstr ""
 "      --from-code=<À̸§>      ÀÔ·Â ÆÄÀÏÀÇ ÀÎÄÚµù\n"
 "                                (Python, Tcl, Glade Á¦¿Ü)\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "±âº»°ªÀ¸·Î ÀÔ·Â ÆÄÀÏÀº ASCII·Î ÀÎÄÚµùµÇ¾î ÀÖ´Ù°í °¡Á¤ÇÕ´Ï´Ù.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing            ÇöÁ¸ÇÏ´Â ÆÄÀÏ°ú ¸Þ¼¼Áö¸¦ ÇÕĨ´Ï´Ù\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=<ÆÄÀÏ.po>   <ÆÄÀÏ.po>ÀÇ ¸Þ¼¼Áö´Â »Ì¾Æ³»Áö ¾Ê½À´Ï´Ù\n"
 
 # TAG°¡ Á¤È®ÀÌ ¹¹Áö?
-#: src/xgettext.c:797
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3647,17 +3651,17 @@ msgstr ""
 "  -c, --add-comments[=<ű×>]    ÁÖ¼® ºÎºÐÀ» <ÅÂÅ©>·Î (ȤÀº Å°¿öµå ÁÙ ¾Õ¿¡\n"
 "                                 ÀÖ´Â °ÍÀ¸·Î) Ãâ·Â ÆÄÀÏ¿¡ ¾¹´Ï´Ù\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language °ü·Ã ¿É¼Ç:\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              ¸ðµç ¹®ÀÚ¿­À» »Ì¾Æ ³À´Ï´Ù\n"
 
-#: src/xgettext.c:805 src/xgettext.c:812
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3671,7 +3675,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3680,7 +3684,7 @@ msgstr ""
 "  -k, --keyword[=<´Ü¾î>]         Ãß°¡·Î ãÀ» Å°¿öµå (<´Ü¾î>°¡ ¾øÀ¸¸é ±âº»\n"
 "                                 Å°¿öµå¸¦ »ç¿ëÇÏÁö ¾Ê°Ú´Ù´Â ÀǹÌÀÔ´Ï´Ù)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3690,7 +3694,7 @@ msgstr ""
 "      --flag=WORD:ARG:FLAG    Å°¿öµå WORDÀÇ ÀÎÀÚ ¹øÈ£ ARG¾È¿¡ ÀÖ´Â ¹®ÀÚ¿­ÀÇ\n"
 "                              Ãß°¡ Ç÷¡±×\n"
 
-#: src/xgettext.c:819
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3704,51 +3708,56 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs                ÀԷ¿¡¼­ ANSI C »ïÁßÀÚ(trigraph)¸¦ ÀνÄÇÕ´Ï"
 "´Ù\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (´ÙÀ½ ¾ð¾î¸¸ Áö¿ø: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt Çü½Ä ¹®ÀÚ¿­À» ¾Ë¾Æ³À´Ï´Ù\n"
 
-#: src/xgettext.c:829 src/xgettext.c:833
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++¸¸ Áö¿ø)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    Qt Çü½Ä ¹®ÀÚ¿­À» ¾Ë¾Æ³À´Ï´Ù\n"
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost Çü½Ä ¹®ÀÚ¿­À» ¾Ë¾Æ³À´Ï´Ù\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                    ´õ ÀÚ¼¼ÇÑ Çü½Ä¹®ÀÚ¿­ ÀÎ½Ä °á°ú\n"
 
-#: src/xgettext.c:854
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     ÀÚ¹Ù .properties ÆÄÀÏÀ» ¾¹´Ï´Ù\n"
 
-#: src/xgettext.c:869
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=<¹®ÀÚ¿­> Ãâ·ÂÇÒ ÀúÀÛ±Ç ¼ÒÀ¯ÀÚ¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3756,7 +3765,17 @@ msgstr ""
 "      --foreign-user             ¿ÜºÎ »ç¿ëÀÚ¸¦ À§ÇØ FSF ÀúÀÛ±Ç Ç¥½Ã¸¦ »®´Ï"
 "´Ù\n"
 
-#: src/xgettext.c:873
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --copyright-holder=<¹®ÀÚ¿­> Ãâ·ÂÇÒ ÀúÀÛ±Ç ¼ÒÀ¯ÀÚ¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3764,7 +3783,7 @@ msgstr ""
 "      --msgid-bugs-address=À̸ÞÀÏ@ÁÖ¼Ò     msgid ¹ö±×¸¦ º¸°íÇÒ ÁÖ¼Ò¸¦ ÁöÁ¤ÇÕ"
 "´Ï´Ù\n"
 
-#: src/xgettext.c:875
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3773,7 +3792,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=<¹®ÀÚ¿­>] msgstr Ç׸ñ¿¡ <¹®ÀÚ¿­> ȤÀº \"\"À» Á¢µÎ¾î"
 "·Î\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3782,23 +3801,23 @@ msgstr ""
 "  -M, --msgstr-suffix[=<¹®ÀÚ¿­>] msgstr Ç׸ñ¿¡ <¹®ÀÚ¿­> ȤÀº \"\"À» Á¢¹Ì¾î"
 "·Î\n"
 
-#: src/xgettext.c:1642
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr "--flagÀÇ ÀÎÀÚ°¡ ::[pass-] ¹®¹ýÀÌ ¾Æ´Õ´Ï´Ù: %s"
 
-#: src/xgettext.c:1741
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "Ç¥ÁØ ÀÔ·Â"
 
-#: src/xgettext.c:1921 src/xgettext.c:1954 src/xgettext.c:2012
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: °æ°í: "
 
-#: src/xgettext.c:1924
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3807,7 +3826,7 @@ msgstr ""
 "Çü½Ä ¹®ÀÚ¿­¿¡ À§Ä¡ ÁöÁ¤À» »ç¿ëÇßÁö¸¸, %sÀº(´Â) À߸øµÈ %s Çü½Ä ¹®ÀÚ¿­ÀÔ´Ï´Ù. "
 "ÀÌÀ¯: %s\n"
 
-#: src/xgettext.c:1925
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3815,7 +3834,7 @@ msgid ""
 msgstr ""
 "¼±¾ðÇÑ °Í°ú´Â ´Þ¸®, '%s'Àº(´Â) ¿Ã¹Ù¸¥ %s Çü½Ä ¹®ÀÚ¿­ÀÌ ¾Æ´Õ´Ï´Ù. ÀÌÀ¯: %s\n"
 
-#: src/xgettext.c:1956
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3828,7 +3847,7 @@ msgstr ""
 "À̸§ÀÌ ÀÖ´Â ÀÎÀÚ¸¦ ÀÌ¿ëÇØ Çü½Ä ¹®ÀÚ¿­À» »ç¿ëÇØ º¸½Ê½Ã¿À.\n"
 "¾Æ´Ï¸é ÀÎÀÚ¿¡ ´ëÇØ Æ©Çà ´ë½Å¿¡ ¸ÅÇÎÀ» »ç¿ëÇØ º¸½Ê½Ã¿À.\n"
 
-#: src/xgettext.c:2014
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3838,27 +3857,27 @@ msgstr ""
 "gettext(\"\")´Â ºó ¹®ÀÚ¿­ÀÌ ¾Æ´Ï¶ó, ¸ÞŸ Á¤º¸°¡ µé¾î ÀÖ´Â \n"
 "Çì´õ Ç׸ñÀ» ¸®ÅÏÇÕ´Ï´Ù.\n"
 
-#: src/xgettext.c:2618
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "'%.*s' Å°¿öµå¿¡ ´ëÇÑ ÀÎÀÚ ÁöÁ¤ÀÌ ¾Ö¸ÅÇÕ´Ï´Ù"
 
-#: src/xgettext.c:2645
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "°æ°í: '%.*s' Å°¿öµå¿¡ ´ëÇØ ÄÁÅؽºÆ®°¡ ¾ø½À´Ï´Ù"
 
-#: src/xgettext.c:2670
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "°æ°í: '%.*s' Å°¿öµåÀÇ º¹¼öÇü ÀÎÀÚ¿¡ ´ëÇØ ÄÁÅؽºÆ®°¡ ¾ø½À´Ï´Ù"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "´Ü¼öÇü°ú º¹¼öÇü »çÀÌ¿¡ ÄÁÅؽºÆ®°¡ ´Ù¸¨´Ï´Ù"
 
-#: src/xgettext.c:2771
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3870,7 +3889,7 @@ msgstr ""
 "º¯¼ö¸¦ ÁöÁ¤ÇϽʽÿÀ; ±×·¸Áö ¾ÊÀ¸¸é --msgid-bugs-address\n"
 "¸í·ÉÇà ¿É¼ÇÀ» »ç¿ëÇϽʽÿÀ.\n"
 
-#: src/xgettext.c:2970
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "\"%s\" ÆÄÀÏ¿¡ NUL·Î ³¡³ªÁö ¾Ê´Â sysdep ¼¼±×¸ÕÆ®°¡ ÀÖ½À´Ï´Ù"
@@ -3879,6 +3898,35 @@ msgstr "\"%s\" 
 msgid ""
 msgstr "<À̸§¾øÀ½>"
 
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "%%%cÀ»(¸¦) ¿©·¯ ¹ø ÂüÁ¶Çß½À´Ï´Ù."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "ÀÌ ÇÁ·Î±×·¥Àº ÀÚÀ¯ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù.  º¹»ç Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ. »ó"
+#~ "Ç°¼º\n"
+#~ "À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "¸Þ¼¼Áö ¸ñ·Ï¿¡ ÄÁÅؽºÆ® ÀÇÁ¸ ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸,\n"
+#~ "C# .dll Çü½ÄÀº ÄÁÅؽºÆ®¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "¸Þ¼¼Áö ¸ñ·Ï¿¡ ÄÁÅؽºÆ® ÀÇÁ¸ ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸,\n"
+#~ "Java ResourceBundle Çü½ÄÀº ÄÁÅؽºÆ®¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
+
 #~ msgid "conversion failure"
 #~ msgstr "º¯È¯ ½ÇÆÐ"
 
diff --git a/gettext-tools/po/nb.po b/gettext-tools/po/nb.po
index 6f9ae8c21..c4d6db54d 100644
--- a/gettext-tools/po/nb.po
+++ b/gettext-tools/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-27 15:20+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2001-05-09 02:08+02:00\n"
 "Last-Translator: Trond Endrestøl \n"
 "Language-Team: Norwegian-bokmål \n"
diff --git a/gettext-tools/po/nl.po b/gettext-tools/po/nl.po
index 6ce88c39f..5840c2fcb 100644
--- a/gettext-tools/po/nl.po
+++ b/gettext-tools/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-23 09:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-10-17 23:28+0200\n"
 "Last-Translator: Benno Schulenberg \n"
 "Language-Team: Dutch \n"
diff --git a/gettext-tools/po/nn.po b/gettext-tools/po/nn.po
index c52a55d0f..b60e04f9f 100644
--- a/gettext-tools/po/nn.po
+++ b/gettext-tools/po/nn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 1996-03-21 08:46 EST\n"
 "Last-Translator: Karl Anders Øygard \n"
 "Language-Team: Norwegian-nynorsk \n"
@@ -15,87 +15,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan ikkje skifte tilbake til filkatalog \"%s\""
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan ikkje skifte tilbake til filkatalog \"%s\""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan ikkje opprette utfila \"%s\""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan ikkje skifte tilbake til filkatalog \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, fuzzy, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "feil under skriving av fila \"%s\""
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "feil under skriving av fila \"%s\""
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "feil under skriving av fila \"%s\""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -104,119 +105,119 @@ msgstr ""
 msgid "Unknown system error"
 msgstr ""
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flagg «%s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: flagg «--%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: flagg «%c%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flagg «%s» treng eit argument\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, fuzzy, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ulovleg flagg -- %c\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, fuzzy, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ulovleg flagg -- %c\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ulovleg flagg -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, fuzzy, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ulovleg flagg -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flagg treng eit argument -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flagg «%s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg «--%s» tek ikkje argument\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av fila \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr ""
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "kan ikkje opprette utfila \"%s\""
@@ -240,281 +241,288 @@ msgstr "kan ikkje opprette utfila \"%s\""
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -525,83 +533,83 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr ""
 "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -609,7 +617,7 @@ msgid ""
 msgstr ""
 "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -617,122 +625,125 @@ msgid ""
 msgstr ""
 "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, fuzzy, c-format
 msgid "too many arguments"
 msgstr "manglar argument"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -740,338 +751,343 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr ""
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1088,31 +1104,31 @@ msgstr ""
 "      --strict             write strict uniforum style\n"
 "  -V, --version            output version information and exit\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1126,51 +1142,51 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1178,39 +1194,53 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, fuzzy, c-format
 msgid "no input files given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1232,80 +1262,80 @@ msgstr ""
 "oversett alle meldingar i programmet.  Der samsvar ikkje kan finnast, vert\n"
 "«fuzzy» samanlikning brukt for å få betre diagnostikk.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne meldinga er brukt, men ikkje definert..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "... men denne definisjonen liknar"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fann %d fatale feil"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1318,74 +1348,74 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1394,22 +1424,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "manglar argument"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1419,67 +1449,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "manglar argument"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1487,210 +1517,210 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1699,48 +1729,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1748,33 +1778,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1782,109 +1812,109 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn: brukar prefiks"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, fuzzy, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1924,30 +1954,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1955,24 +1985,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -1980,54 +2010,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2039,54 +2069,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2095,7 +2125,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2104,7 +2134,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2113,12 +2143,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2126,7 +2156,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2135,7 +2165,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2143,174 +2173,174 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "denne meldinga er brukt, men ikkje definert i %s"
 msgstr[1] "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "denne meldinga er brukt, men ikkje definert i %s"
 msgstr[1] "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "filhovud-feltet «%s» manglar i filhovud"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "nokre filhovud-felt har framleis sin initielle verdi"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "feltet «%s» har framleis sin forvalgte verdi"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2431,17 +2461,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2450,61 +2480,61 @@ msgstr ""
 "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n"
 "utdaterte %d.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr ""
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2512,41 +2542,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2559,208 +2589,208 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr ""
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, fuzzy, c-format
 msgid "missing `msgstr[]' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, fuzzy, c-format
 msgid "missing `msgid_plural' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, fuzzy, c-format
 msgid "too many errors, aborting"
 msgstr "for mange feil, avsluttar"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "den første definisjonen finst her"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "filen \"%s\" er avkutta"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr ""
@@ -2769,140 +2799,137 @@ msgstr ""
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "manglar argument"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikkje opprette utfila \"%s\""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr ""
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "kan ikkje skifte til filkatalog \"%s\""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, fuzzy, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2911,7 +2938,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2920,13 +2947,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -2934,177 +2961,182 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: ulovleg flagg -- %c\n"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3112,7 +3144,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3120,7 +3152,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3128,7 +3160,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3136,7 +3168,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3144,7 +3176,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3152,78 +3184,78 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikkje brukast når utdata vert skrive til standard ut"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3235,58 +3267,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3295,14 +3327,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3310,7 +3342,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3319,104 +3351,119 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3425,34 +3472,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3460,12 +3507,12 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
@@ -3713,8 +3760,7 @@ msgstr ""
 #~ "vanlege filkatalogen, kan ein annan filkatalog spesifiserast ved hjelp "
 #~ "av\n"
 #~ "miljøvariabelen TEXTDOMAIN.\n"
-#~ "Når flagget -s vert brukt, oppfører programmet seg som kommandoen "
-#~ "«echo»,\n"
+#~ "Når flagget -s vert brukt, oppfører programmet seg som kommandoen «echo»,\n"
 #~ "men gjer ikkje ein enkel kopiering av argumenta sine til standard ut.  I\n"
 #~ "staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
 #~ "Standard søkekatalog er: %s\n"
@@ -3761,8 +3807,7 @@ msgstr ""
 #~ "vanlege filkatalogen, kan ein annan filkatalog spesifiserast ved hjelp "
 #~ "av\n"
 #~ "miljøvariabelen TEXTDOMAIN.\n"
-#~ "Når flagget -s vert brukt, oppfører programmet seg som kommandoen "
-#~ "«echo»,\n"
+#~ "Når flagget -s vert brukt, oppfører programmet seg som kommandoen «echo»,\n"
 #~ "men gjer ikkje ein enkel kopiering av argumenta sine til standard ut.  I\n"
 #~ "staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
 #~ "Standard søkekatalog er: %s\n"
@@ -3810,8 +3855,7 @@ msgstr ""
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer "
-#~ "(forvalgt)\n"
+#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer (forvalgt)\n"
 #~ "      --omit-header             ikkje lag startseksjon med «msgid \"\"»\n"
 #~ "  -p, --output-dir=KAT          plassér utfiler i filkatalogen KAT\n"
 #~ "  -s, --sort-output             sortér utdata og ta bort duplikat\n"
@@ -3916,8 +3960,7 @@ msgstr ""
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer "
-#~ "(forvalgt)\n"
+#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer (forvalgt)\n"
 #~ "      --omit-header             ikkje lag startseksjon med «msgid \"\"»\n"
 #~ "  -p, --output-dir=KAT          plassér utfiler i filkatalogen KAT\n"
 #~ "  -s, --sort-output             sortér utdata og ta bort duplikat\n"
diff --git a/gettext-tools/po/pl.po b/gettext-tools/po/pl.po
index 20a3dd043..bfe7eefd0 100644
--- a/gettext-tools/po/pl.po
+++ b/gettext-tools/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-23 09:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-10-17 13:50+0200\n"
 "Last-Translator: Rafa³ Maszkowski \n"
 "Language-Team: Polish \n"
diff --git a/gettext-tools/po/pt.po b/gettext-tools/po/pt.po
index 85387923f..266c062da 100644
--- a/gettext-tools/po/pt.po
+++ b/gettext-tools/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.23\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 1996-09-18 20:51 WET DST\n"
 "Last-Translator: Nuno Oliveira \n"
 "Language-Team: Portuguese \n"
@@ -14,87 +14,88 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro durante a abertura de \"%s\" para leitura"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "erro durante a abertura de \"%s\" para escrita"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -103,119 +104,119 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Erro desconhecido do sistema"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: a opção `%s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: a opção `--%s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: a opção `%c%s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: a opção `%s' requere um argumento\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opção não reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opção não reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opção ilegal -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opção ilegal -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opção requere um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: a opção `%s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: a opção `--%s' não permite um argumento\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "memória exausta"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "impossível criar o ficheiro de saída \"%s\""
@@ -239,280 +240,287 @@ msgstr "imposs
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -523,211 +531,214 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 "tuple"
 msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 "mapping"
 msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para mais informação\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -735,338 +746,343 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr ""
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "são necessários exactamente 2 ficheiros"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivas"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1088,31 +1104,31 @@ msgstr ""
 "  -V, --version               mostra a informação de versão e sai\n"
 "  -w, --width=NÚMERO          especifica a largura de página na saída\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1126,51 +1142,51 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1178,39 +1194,53 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "ficheiros de entrada não fornecidos"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "são necessários exactamente 2 ficheiros"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1237,80 +1267,80 @@ msgstr ""
 "é usado um emparelhamento aproximado para produzir melhores\n"
 "diagnósticos.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "atenção: esta mensagem não é usada"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "esta mensagem é usada mas não definida..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mas esta definição é semelhante"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "esta mensagem é usada mas não definida em %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "atenção: esta mensagem não é usada"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "encontrados %d erros fatais"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1323,74 +1353,74 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "são necessários exactamente 2 ficheiros"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1399,22 +1429,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "argumentos insuficientes"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1424,67 +1454,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "argumentos insuficientes"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1492,207 +1522,207 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, fuzzy, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensagens traduzidas"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, fuzzy, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduções aproximadas"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, fuzzy, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensagens não traduzidas"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1701,48 +1731,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1750,33 +1780,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1784,111 +1814,111 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nome de domínio \"%s\" não apropriado como nome de ficheiro"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nome de domínio \"%s\" não apropriado como nome de ficheiro:\n"
 "prefixo usado"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "directiva `domínio %s' ignorada"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, fuzzy, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1928,30 +1958,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1959,24 +1989,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -1984,54 +2014,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2043,54 +2073,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2099,7 +2129,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2108,7 +2138,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2117,12 +2147,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2130,7 +2160,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2139,7 +2169,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2147,176 +2177,176 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "sequência de controlo ilegal"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "sequência de controlo ilegal"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "sequência de controlo ilegal"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "esta mensagem é usada mas não definida em %s"
 msgstr[1] "esta mensagem é usada mas não definida em %s"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "esta mensagem é usada mas não definida em %s"
 msgstr[1] "esta mensagem é usada mas não definida em %s"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "o campo `%s' falta no cabeçalho"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "o campo `%s' do cabeçalho deve começar no início da linha"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "alguns campos do cabeçalho ainda têm o valor inicial por defeito"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "o campo `%s' ainda tem o valor por defeito inicial"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro durante a abertura de \"%s\" para leitura"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2439,17 +2469,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "esta mensagem é usada mas não definida em %s"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "esta mensagem é usada mas não definida em %s"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2458,61 +2488,61 @@ msgstr ""
 "%sLidas %d antigas + %d referências, combinadas %d, aproximadas %d, faltam %"
 "d, obsoletas %d.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr "terminado.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivas"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2520,41 +2550,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2567,208 +2597,208 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, fuzzy, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 #, fuzzy
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr ""
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, fuzzy, c-format
 msgid "missing `msgstr[]' section"
 msgstr "falta a secção `msgstr'"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, fuzzy, c-format
 msgid "missing `msgid_plural' section"
 msgstr "falta a secção `msgstr'"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "falta a secção `msgstr'"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "demasiados erros, interrompendo"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, fuzzy, c-format
 msgid "invalid multibyte sequence"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palavra chave \"%s\" desconhecida"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, fuzzy, c-format
 msgid "invalid control sequence"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "fim-de-ficheiro dentro da cadeia"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "fim-de-linha dentro da cadeia"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro não pode conter directivas de domínio"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "definição de mensagem duplicada"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "este é o local da primeira definição"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "ficheiro \"%s\"truncado"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr ""
@@ -2777,133 +2807,130 @@ msgstr ""
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro durante a abertura de \"%s\" para leitura"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "demasiados argumentos"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "canal de saída por defeito (stdout)"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "erro durante a abertura de \"%s\" para escrita"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -2911,7 +2938,7 @@ msgstr ""
 "as mensagens de internacionalização não devem conter\n"
 "a sequência de escape `\\%c'"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2920,7 +2947,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2929,13 +2956,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -2943,177 +2970,182 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: opção ilegal -- %c\n"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3121,7 +3153,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3129,7 +3161,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3137,7 +3169,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3145,7 +3177,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3153,7 +3185,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3161,81 +3193,81 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing não pode ser usada quando a saída\n"
 "é escrita no stdout"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, fuzzy, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "cuidado: o tipo do ficheiro `%s' com a extensão `%s' é desconhecido;\n"
 "será tentado C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3247,58 +3279,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3307,14 +3339,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3322,7 +3354,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3331,104 +3363,119 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "entrada standard"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3437,34 +3484,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3472,12 +3519,12 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
diff --git a/gettext-tools/po/pt_BR.po b/gettext-tools/po/pt_BR.po
index 6a8a2c3ec..763388676 100644
--- a/gettext-tools/po/pt_BR.po
+++ b/gettext-tools/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2001-04-03 08:25+02:00\n"
 "Last-Translator: Flávio Bruno Leitner \n"
 "Language-Team: Brazilian Portuguese \n"
@@ -17,87 +17,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro ao abrir \"%s\" para leitura"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "erro ao abrir o arquivo \"%s\" para gravação"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "erro ao gravar o arquivo \"%s\""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -106,119 +107,119 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opção `%s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opção `--%s' não aceita parâmetros\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opção `%c%s' não aceita parâmetros\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opção `%s' requer um argumento\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opção não reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opção não reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opção ilegal -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opção inválida -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opção requer um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opção `-W %s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opção `-W %s' não aceita parâmetros\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ao gravar o arquivo \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "Memória insuficiente"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "não foi possível criar o arquivo de saída \"%s\""
@@ -242,281 +243,288 @@ msgstr "n
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr ""
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr ""
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -527,83 +535,83 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr ""
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr ""
 "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -611,7 +619,7 @@ msgid ""
 msgstr ""
 "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -619,125 +627,125 @@ msgid ""
 msgstr ""
 "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr ""
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Este é um sofware livre; veja os fontes para condições de cópia.  Não existe\n"
-"garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA FINALIDADE.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "excesso de parâmetros"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para maiores informações\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr ""
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr ""
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -745,339 +753,344 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 #, fuzzy
 msgid "Report bugs to .\n"
 msgstr "Reporte bugs para .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "são necessários 2 arquivos de entrada"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivos"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "não foi informado o arquivo de entrada"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1097,31 +1110,31 @@ msgstr ""
 "  -V, --version            apresenta informações de versão e finaliza\n"
 "  -w, --width=NÚMERO       configura largura da página de saída\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "critério de seleção especificado impossível (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1151,51 +1164,51 @@ msgstr ""
 "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n"
 "os arquivos PO serão preservados.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1203,39 +1216,53 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "arquivos de entrada não informados"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "são necessários 2 arquivos de entrada"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1260,81 +1287,81 @@ msgstr ""
 "mensagens do programa foram traduzidas. Onde uma igualdade não puder ser\n"
 "encontrada uma aproximação é utilizada para produzir um melhor diagnóstico.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "atenção: esta mensagem não é utilizada"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "esta mensagem é utilizada, mas não foi definida..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mas esta definição é similar"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "atenção: esta mensagem não é utilizada"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "encontrado %d erro fatal"
 msgstr[1] "encontrados %d erros fatais"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "pelo menos dois arquivos devem ser especificados"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1363,74 +1390,74 @@ msgstr ""
 "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n"
 "os arquivos PO serão preservados.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "não foi informado o arquivo de entrada"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "são necessários 2 arquivos de entrada"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1439,22 +1466,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "parâmetros não informados"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1464,67 +1491,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "parâmetros não informados"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "pelo menos dois arquivos devem ser especificados"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1532,210 +1559,210 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensagem traduzida"
 msgstr[1] "%d mensagens traduzidas"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d tradução aproximada (fuzzy)"
 msgstr[1] ", %d traduções aproximadas (fuzzy)"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensagem não traduzida"
 msgstr[1] ", %d mensagens não traduzidas"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1744,48 +1771,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "não foi informado o arquivo de entrada"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1793,33 +1820,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1827,117 +1854,117 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "%s: aviso: falta o cabeçalho relativo ao charset\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nome do domínio \"%s\" não é válido como nome de arquivo"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nome do domínio \"%s\" não é válido como nome de arquivo: será usado um "
 "prefixo"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s': diretiva ignorada"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "`msgstr' vazia: mensagem ignorada"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "`msgstr' aproximada (fuzzy): mensagem ignorada"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1977,30 +2004,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2008,24 +2035,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2033,54 +2060,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2092,54 +2119,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, fuzzy, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s"
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, fuzzy, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s"
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2148,7 +2175,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2157,7 +2184,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2166,12 +2193,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2179,7 +2206,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2188,7 +2215,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2196,172 +2223,172 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "seqüência de controle ilegal"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "seqüência de controle ilegal"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "seqüência de controle ilegal"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "esta mensagem é utilizada mas não definida em %s"
 msgstr[1] "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "esta mensagem é utilizada mas não definida em %s"
 msgstr[1] "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' e `msgstr' não começam com '\\n'"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' e `msgstr[%u]' não começam com '\\n'"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' e `msgstr' não começam com '\\n'"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' e `msgstr' não terminam com '\\n'"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' e `msgstr[%u]' não terminam com '\\n'"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' e `msgstr' não terminam com '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "campo `%s' faltando no cabeçalho"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "campo `%s' deve iniciar no começo da linha"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "alguns campos do cabeçalho ainda possuem os valores iniciais padrões"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "campo `%s' ainda possui o valor inicial"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro ao abrir \"%s\" para leitura"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2482,17 +2509,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2501,61 +2528,61 @@ msgstr ""
 "%sLido %ld antigas + %ld referência, concatenadas %ld, aproximadas %ld, "
 "perdidas %ld, obsoletas %ld.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " feito.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivos"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2563,41 +2590,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "não foi informado o arquivo de entrada"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2610,24 +2637,24 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, fuzzy, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2636,35 +2663,35 @@ msgstr ""
 "%s: aviso: charset \"%s\" não é um encoding portável\n"
 "%*s aviso: conversão de charset pode não funcionar"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 #, fuzzy
 msgid ""
 "Charset missing in header.\n"
@@ -2673,150 +2700,150 @@ msgstr ""
 "%s: aviso: falta o cabeçalho relativo ao charset\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso inconsistente de #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "seção `msgstr[]' não localizada"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "seção `msgid_plural' não localizada"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "seção `msgstr' não localizada"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "primeira forma em plural tem o índice diferente de zero"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "forma plural tem o índice errado"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "excesso de erros - finalizando"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "sequência multibyte inválido"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sequência multibyte inválido"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sequência multibyte inválido"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palavra chave \"%s\" desconhecida"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "seqüência de controle ilegal"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "fim de arquivo sem string"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "fim de linha sem string"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este arquivo parece não conter diretivas de domínio"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "definição duplicada de mensagem"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...esta é a localização da primeira definição"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "arquivo \"%s\" truncado"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "arquivo \"%s\" contém string não terminada em NULL"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "arquivo \"%s\" não está no formato GNU .mo"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "arquivo \"%s\" contém string não terminada em NULL"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%d: aviso: caractere constante indeterminado"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Escrito por %s.\n"
@@ -2825,140 +2852,137 @@ msgstr "Escrito por %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro ao abrir \"%s\" para leitura"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "excesso de parâmetros"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "erro ao gravar o arquivo \"%s\""
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "saída padrão"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, c-format
+msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "erro ao abrir o arquivo \"%s\" para gravação"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "mensagens internacionalizadas não devem conter o caractere de escape `\\%c'"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2967,7 +2991,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2976,13 +3000,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -2990,177 +3014,182 @@ msgid ""
 "strings, not in the context strings\n"
 msgstr ""
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "erro ao gravar o arquivo \"%s\""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: aviso: caractere constante indeterminado"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: aviso: caractere constante indeterminado"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: aviso: string literal indeterminada"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: opção inválida -- %c\n"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3168,7 +3197,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3176,7 +3205,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3184,7 +3213,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3192,7 +3221,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3200,7 +3229,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3208,78 +3237,78 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing não pode ser usado enquanto a saída é escrita na saída padrão"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext não pode funcionar sem as teclas para procurar"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "aviso: arquivo `%s' extensão `%s' é desconhecida; tentarei C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "não foi informado o arquivo de entrada"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3291,58 +3320,58 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3351,14 +3380,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3366,7 +3395,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3375,104 +3404,119 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "entrada padrão"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr ""
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3481,34 +3525,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3516,15 +3560,28 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "idioma `%s' desconhecido"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Este é um sofware livre; veja os fontes para condições de cópia.  Não "
+#~ "existe\n"
+#~ "garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA "
+#~ "FINALIDADE.\n"
+
 #, fuzzy
 #~ msgid "%s:%lu: warning: unterminated string"
 #~ msgstr "%s:%d: aviso: string literal indeterminada"
diff --git a/gettext-tools/po/ro.po b/gettext-tools/po/ro.po
index 1f4550ed4..b1368e5e6 100644
--- a/gettext-tools/po/ro.po
+++ b/gettext-tools/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2003-11-23 11:43+0200\n"
 "Last-Translator: Eugen Hoanca \n"
 "Language-Team: Romanian \n"
@@ -16,91 +16,92 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, fuzzy, c-format
 msgid "invalid argument %s for %s"
 msgstr "parametru invalid `%s' pentru `%s'"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, fuzzy, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Parametrii valizi sunt: "
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "nu se poate gãsi un director temporar, încercaþi sã setaþi $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "nu se poate crea un director temporar folosind modelul(template) \"%s\""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "nu se poate crea fiºierul de ieºire(output) \"%s\""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
 "nu se poate crea un director temporar folosind modelul(template) \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "eroare în timpul deschiderii \"%s\" pentru citire"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "nu se poate deschide fiºierul de backup \"%s\" pentru scriere"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "eroare în citirea lui \"%s\""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "eroare în scrierea lui \"%s\""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "eroare dupã citirea lui \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() eºuat"
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 "Nu a fost gãsit compilatorul Java, încercaþi sã instalaþi gcj sau setaþi "
 "$JAVAC"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, fuzzy, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -111,123 +112,123 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscutã"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Subprocesul %s a eºuat"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opþiunea `%s' este ambiguã\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `--%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `%c%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opþiunea `%s' necesitã un parametru\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opþiune necunoscutã `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opþiune necunoscutã `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opþiune ilegalã -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: optiune invalidã -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opþiunea necesitã un parametru -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opþiunea `-W %s' este ambiguã\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `-W %s' nu permite parametri\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "eroare în crearea \"%s\""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "eroare în scrierea fiºierului \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Nu a fost gãsit compilatorul Java, încercaþi sã instalaþi gcj sau setaþi "
 "$JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Nu a fost gãsitã maºina virtualã Java, încercaþi sã instalaþi gij sau sã "
 "setaþi $JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "eroare I/O a subprocesului %s"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "memorie plinã"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "nu se poate crea legãtura(pipe)"
@@ -251,45 +252,45 @@ msgstr "nu se poate crea leg
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandle a eºuat cu cod de eroare 0x%08x"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle a eºuat"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "subprocesul %s"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "subprocesul %s a primit semnalul fatal %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 "'%s' nu este un format valid de ºir %s, spre deosebire de 'msgid'. Motiv: %s"
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
@@ -297,18 +298,18 @@ msgstr ""
 "o specificaþie de formatare pentru parametrul %u, ca în `%s', nu existã în "
 "'msgid'"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "o specificaþie de format pentru argumentul %u nu existã în '%s'"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
@@ -316,12 +317,12 @@ msgstr ""
 "specificaþiile de formatare din 'msgid' ºi '%s' pentru argumentul %u sunt "
 "diferite"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, fuzzy, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "În directiva numãrul %u  '~,' este folositã într-o poziþie invalidã."
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -331,52 +332,52 @@ msgstr ""
 "macro de formatare specificat. Numele valide de macro-uri sunt listate în "
 "ISO C 99 secþiunea 7.8.1."
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "În directiva numãrul %u, marcajul(token) de dupã '<' nu este urmat de '>'."
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "ªirul are referire la argumentul numãrul %u dar ignorã argumentul numãrul %u."
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "numãrul de specificaþii de formatare din 'msgid' ºi '%s' este diferit"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "În numãrul de directivã %u, '{' nu este urmat de un numãr de argument."
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, fuzzy, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "În numãrul de directivã %u, '{' nu este urmat de un numãr de argument."
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 "ªirul se terminã în mijlocul directivei: s-a gãsit '{' fãrã '}' potrivit."
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, fuzzy, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 "În directiva numãrul %u, caracterul '%c' nu este un digitit între 1 ºi 9."
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, fuzzy, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "În directiva numãrul %u  '~,' este folositã într-o poziþie invalidã."
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
@@ -384,23 +385,23 @@ msgstr ""
 "ªirul începe în mijlocul directivei: s-a gãsit '}' fãrã a se gãsi '{' "
 "potrivit."
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, fuzzy, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "ªirul se terminã în mijlocul directivei."
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "În directiva numãrul %u parametrul %d este negativ."
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 "În numãrul de directivã %u, marcajele(flags) nu sunt admise înainte de '%c'."
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -408,32 +409,40 @@ msgid ""
 msgstr ""
 "În directiva numãrul %u, numãrul de argument 0 nu este un întreg pozitiv."
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"În numãrul de directivã %u, marcajele(flags) nu sunt admise înainte de '%c'."
+
+#: src/format-gcc-internal.c:404
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "În directiva numãrul %u parametrul %d este negativ."
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 "În numãrul de directivã %u, marcajele(flags) nu sunt admise înainte de '%c'."
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "ªirul se terminã în mijlocul directivei."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -441,14 +450,14 @@ msgstr ""
 "ªirul are referire la argumente atât prin numere absolute de argument cât ºi "
 "prin specificaþii de argument nenumerotate."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 "În directiva numãrul %u, numãrul de argument 0 nu este un întreg pozitiv."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
@@ -457,7 +466,7 @@ msgstr ""
 "În numãrul de directivã %u, numãrul mãrimii argumentului 0 nu este un întreg "
 "pozitiv."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
@@ -466,7 +475,7 @@ msgstr ""
 "În numãrul de directivã %u, numãrul preciziei argumentului 0 nu este un "
 "întreg pozitiv."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
@@ -475,7 +484,7 @@ msgstr ""
 "În directiva numãrul %u, caracterul '%c' nu este un specificator de "
 "conversie valid."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -484,12 +493,12 @@ msgstr ""
 "Caracterul care finalizeazã numãrul de directivã %u nu este un specificator "
 "de conversie valid."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "ªir are referire la numãrul de argument %u prin metode incompatibile."
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -498,19 +507,19 @@ msgstr ""
 "În numãrul de directivã %u, subºirul \"%s\" nu este un stil valid de datã/"
 "orã."
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "În numãrul de directivã %u. \"%s\" nu este urmat de o virgulã."
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 "În numãrul de directivã %u, subºirul \"%s\" nu este un stil valid de numãr."
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -519,12 +528,12 @@ msgstr ""
 "În numãrul de directivã %u, numãrul de argument nu este urmat de o virgulã "
 "ºi unul dintre \"%s\", \"%s\",\"%s\",\"%s\"."
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "În numãrul de directivã %u, alegerea nu conþine numãr."
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -533,7 +542,7 @@ msgstr ""
 "În numãrul de directivã %u, o alegere conþine un numãr care nu este urmat de "
 "'<', '#' sau '%s'."
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -542,12 +551,12 @@ msgstr ""
 "o specificaþie de formatare pentru argumentul {%u}, ca în '%s', nu existã în "
 "'msgid'"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "o specificaþie de formatare pentru argumentul {%u} nu existã în '%s'"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -555,8 +564,8 @@ msgstr ""
 "specificaþiile de format din 'msgid' ºi '%s' pentru argument {%u} nu sunt la "
 "fel"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -565,7 +574,7 @@ msgstr ""
 "În directiva numãrul %u, parametrul %u este de tipul '%s' dar se aºtepta "
 "parametru de tipul %s."
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -580,33 +589,33 @@ msgstr[1] ""
 "În directiva numãrul %u sunt furnizaþi prea mulþi parametri; se aºteptau cel "
 "mult %u parametrii."
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "În directiva numãrul %u, '%c' nu este urmat de un digit."
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "În directiva numãrul %u parametrul %d este negativ."
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "ªirul se terminã în mijlocul unei directive ~/../."
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "S-a gãsit '~%c' fãrã '~%c' corespunzãtor."
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "În directiva numãrul %u sunt specificaþi ambii modificatori @ ºi : ."
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -615,27 +624,27 @@ msgstr ""
 "În directiva numãrul %u '~[' nu este urmat de douã clauze, separate prin "
 "'~,'."
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "În directiva numãrul %u  '~,' este folositã într-o poziþie invalidã."
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "ªirul se referã la anumite argumente în moduri incompatibile."
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "specificaþiile de format din 'msgid' ºi '%s' nu sunt echivalente"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr ""
 "specificaþiile de format din '%s' nu sunt subset al acelora din 'msgid'"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -644,12 +653,12 @@ msgstr ""
 "În directiva numãrul %u, specificatorul de mãrime este incompatibil cu "
 "specificatorul de conversie '%c'."
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "o specificare de format pentru argumentul '%s' nu existã în '%s'"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -657,12 +666,12 @@ msgstr ""
 "ªirul se referã la argumente atât prin numele argumentelor cât ºi prin "
 "specificaþii de argument nenominalizate."
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "ªirul se referã la argumentul numit '%s' în moduri incompatibile."
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -671,7 +680,7 @@ msgstr ""
 "specificaþiile de format din 'msgid' aºteaptã o mapare, acelea din '%s' "
 "aºteaptã altceva(tuple)"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -680,7 +689,7 @@ msgstr ""
 "specificaþiile de formatare din 'msgid' aºteaptã altceva (tuple), acelea din "
 "'%s' aºteaptã o mapare"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -689,7 +698,7 @@ msgstr ""
 "specificarea de formatare pentru argumentul '%s', precum în '%s' nu existã "
 "în 'msgid'"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
@@ -697,16 +706,18 @@ msgstr ""
 "specificaþiile de formatare din 'msgid' ºi '%s' pentru argumentul '%s' nu "
 "sunt la fel"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "Referinþe multiple la % % %c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "ªirul se referã la o variabilã de shell cu un nume non-ASCII."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -714,7 +725,7 @@ msgstr ""
 "ªirul se referã la o variabilã de shell cu o sintaxã complexã cu acolade. "
 "Aceastã sintaxã nu este suportatã din motive de securitate."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
@@ -722,11 +733,11 @@ msgstr ""
 "ªirul se referã la o variabilã de shell a cãrei valoare poate fi diferitã în "
 "funcþiile de shell."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "ªirul se referã la o variabilã de shell cu un nume gol."
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
@@ -734,7 +745,7 @@ msgid ""
 msgstr ""
 "În directiva numãrul %u, caracterul '%c' nu este un digitit între 1 ºi 9."
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
@@ -742,73 +753,71 @@ msgid ""
 msgstr ""
 "Caracterul care terminã directiva numãrul %u nu este un digit între 1 ºi 9."
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Acesta este software liber; citiþi sursa pentru condiþii de copiere.  NU existã NICI o \n"
-"garanþie; nici mãcar pentru VANDABILITATE sau MODIFICARE ÎNTR-UN SCOP PRIVAT.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "prea mulþi parametri"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Încercaþi `%s --help' pentru mai multe informaþii.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Folosire: %s [OPÞIUNE]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Afiºeazã numele de host al maºinii.\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Format de ieºire(output):\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short           nume de host scurtat\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -819,74 +828,79 @@ msgstr ""
 "complet calificat,\n"
 "                          ºi aliasurile\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      adresele pentru numele de host\n"
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Ieºire(output) informativã:\n"
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  afiºeazã acest ajutor ºi iese\n"
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               afiºeazã informaþii despre versiune ºi iese\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "Raportaþi bug-urile la .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "nu s-a putut afla numele de host"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "cel mult un fiºier de intrare(input) este permis"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ºi %s se exclud reciproc"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Folosire: %s [OPÞIUNE] [FIªIER_INTRARE]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -895,10 +909,10 @@ msgstr ""
 "Filtreazã mesajele unui catalog de traduceri potrivit atributelor lor,\n"
 "ºi manipuleazã atributele.\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -906,23 +920,23 @@ msgstr ""
 "Parametrii obligatorii la opþiunile lungi sunt obligatorii ºi la opþiunile "
 "scurte.\n"
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "Locaþie fiºier intrare(input):\n"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FIªIER_INTRARE                   fiºier de intrare(input) PO\n"
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -930,33 +944,33 @@ msgstr ""
 "  -D, --directory=DIRECTOR   adaugã DIRECTOR în lista de cãutare a "
 "fiºierelor de intrare\n"
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Dacã nu este dat nici un fiºier de intrare sau este -, se va citi intrarea"
 "(input) standard.\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "Locaþie fiºier ieºire(output):\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FIªIER      scrie output-ul în fiºierul specificat\n"
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -966,12 +980,12 @@ msgstr ""
 "fiºier\n"
 "de ieºire(output) sau dacã acesta este -.\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selecþie mesaje:\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -979,7 +993,7 @@ msgstr ""
 "      --translated            pãstreazã pe cele traduse, ºterge mesajele "
 "netraduse\n"
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -987,59 +1001,59 @@ msgstr ""
 "      --untranslated          pãstreazã pe cele netraduse, ºterge mesajele "
 "traduse\n"
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              ºterge mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            pãstreazã mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           ºterge mesajele învechite #~ \n"
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         pãstreazã mesajele învechite #~ \n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulare de atribute:\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             seteazã toate mesajele 'fuzzy'\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           seteazã toate mesajele non-'fuzzy'\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          seteazã toate mesajele învechite\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        seteazã toate mesajele non-învechite\n"
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           seteazã toate mesajele non-'fuzzy'\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1047,7 +1061,7 @@ msgstr ""
 "      --only-file=FIªIER.po     manipuleazã doar intrãrile listate în FIªIER."
 "po\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1055,13 +1069,13 @@ msgstr ""
 "      --ignore-file=FIªIER.po   manipuleazã doar intrãrile nelistate în "
 "FIªIER.po\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 sinonim pentru --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1069,16 +1083,16 @@ msgstr ""
 "      --obsolete              sinonim pentru --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaxã fiºier de intrare(input:\n"
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1086,8 +1100,8 @@ msgstr ""
 "  -P, --properties-input     fiºierul de intrare(input) este în sintaxã "
 "Java .properties\n"
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1096,25 +1110,25 @@ msgstr ""
 "      --stringtable-input     fiºierul de intrare(input) este în sintaxã \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalii de output:\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             nu foloseºte escape-uri C în output\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1122,28 +1136,28 @@ msgstr ""
 "  -E, --escape                foloseºte escape-uri C în output, fãrã "
 "caractere extinse\n"
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              scrie fiºierul PO chiar dacã e gol\n"
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                scrie fiºierul .po folosind stil indentat\n"
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           nu scrie liniile '#: filename:line'\n"
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1151,39 +1165,39 @@ msgstr ""
 "  -n, --add-location          genereazã liniile '#: filename:"
 "line' (implicit)\n"
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                scrie strict fiºiere conforme Uniforum\n"
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     scrie un fiºier .properties Java\n"
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output     scrie un fiºier .strings NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr " -w, --width=NUMÃR          setare lãþime output paginã\n"
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1194,32 +1208,32 @@ msgstr ""
 "                              decât lãþimea paginii de output,în câteva "
 "linii\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genereazã output sortat\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          sorteazã output-ul dupã locaþia fiºierului\n"
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "criteriu de selecþie specificat imposibil (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Folosire: %s [OPÞIUNE] [FIªIER_INTRARE]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1243,26 +1257,26 @@ msgstr ""
 "este specificat --use-first, caz în care vor fi preluate din primul fiºier PO pentru\n"
 "a fi definite. Pozitþiile din fiºier din toate fiºierele PO vor fi cumulate.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FIªIER_INTRARE ...                  fiºiere de intrare(input)\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FIªIER          obþine lista de fiºiere de intrare din "
 "FIªIER\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 "Dacã fiºierul de intrare este -, se va citi intrarea(input) standard.\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1273,7 +1287,7 @@ msgstr ""
 "este\n"
 "                                 infinit\n"
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1283,7 +1297,7 @@ msgstr ""
 "                                 definiþii, dacã nu este setat implicit este "
 "0\n"
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1292,7 +1306,7 @@ msgstr ""
 "  -u, --unique                   scurtãturã pentru --less-than=2, solicitã\n"
 "                                 ca doar mesajele unice sã fie tipãrite\n"
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
@@ -1301,7 +1315,7 @@ msgstr ""
 "  -P, --properties-input     fiºierele de intrare(input) sunt în sintaxã ."
 "properties Java\n"
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1311,13 +1325,13 @@ msgstr ""
 "      --stringtable-input     fiºierele de intrare(input) sunt în sintaxã \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 " -t, --to-code=NUME             codarea(encoding) pentru ieºire(output)\n"
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1328,27 +1342,41 @@ msgstr ""
 "                                 fiecare mesaj, nu îmbinã mai multe "
 "traduceri\n"
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "nu au fost date fiºiere de intrare(input)"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "sunt necesare exact 2 fiºiere de intrare(input)"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Folosire: %s [OPÞIUNE] def.po ref.pot\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1366,22 +1394,22 @@ msgstr ""
 "s-a  gãsit o potrivire exactã, se va marca mesajul cu fuzzy pentru a produce\n"
 "diagnostice mai bune.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traduceri\n"
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referinþe la surse\n"
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificatori de operaþie:\n"
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1389,63 +1417,63 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          aplicã ref.pot pe fiecare domeniu din def.po\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 "  -f, --use-fuzzy             foloseºte intrãri parþial traduse la ieºire"
 "(output)\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --untranslated          pãstreazã pe cele netraduse, ºterge mesajele "
 "traduse\n"
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "avertisment: acest mesaj nu este folosit"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "acest mesaj este folosit dar nu este definit..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...dar definiþia este similarã"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "acest mesaj este folosit dar nu ºi definit în %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "avertisment: acest mesaj nu este folosit"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "s-a gãsit %d eroare fatalã"
 msgstr[1] "s-au gãsit %d erori fatale"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "cel puþin douã fiºiere trebuie specificate"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1466,7 +1494,7 @@ msgstr ""
 "comentariile ºi comentariile extrase vor fi pãstrate, dar doar dacã sunt definite\n"
 "în primul fiºier PO.  Pozitþiile din fiºier din toate fiºierele PO vor fi cumulate.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1476,45 +1504,45 @@ msgstr ""
 "                                 definiþii, dacã nu este setat implicit este "
 "1\n"
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header              nu include în header intrarea `msgid \"\"'\n"
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Face conversia unui catalog de traduceri într-o altã codare(encoding) de "
 "caractere.\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Þintã conversie:\n"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "Codarea(encoding) implicitã este codarea(encoding) localizãrii curente.\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 "      --force-po                 scrie fiºierul PO chiar dacã este vid\n"
 "  -i, --indent                   scrie fiºierul .po folosind stil indentat\n"
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location              nu scrie linii '#: filename:line'\n"
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
@@ -1523,29 +1551,29 @@ msgstr ""
 "      --add-location             genereazã linii '#: filename:"
 "line' (implicit)\n"
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                   scrie strict fiºiere conforme Uniforum\n"
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "nu este furnizat nici un fiºier de intrare"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr "este solicitat exact un singur fiºier de intrare"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Folosire: %s [OPÞIUNE] FIªIER_INTRARE\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1558,23 +1586,23 @@ msgstr ""
 "(în general creat de xgettext).  Intrãrilor netraduse le sunt asignate traduceri care\n"
 "sunt identice cu msgid, ºi care vor fi marcate fuzzy.\n"
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 "  FIªIER_INTRARE ...                  fiºiere de intrare(input) PO sau POT\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr "lipseºte numele comenzii"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Folosire: %s [OPÞIUNE] COMANDÃ [OPÞIUNE-COMANDÃ]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1589,7 +1617,7 @@ msgstr ""
 "Ieºirea(output) acesteia devine output-ul msgexec.  codul returnat de msgexec\n"
 "este maximumul de returnare de-a lungul tuturor invocaþiilor.\n"
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1599,43 +1627,43 @@ msgstr ""
 "un octet null.  Rezultatul(output) \"msgexec 0\" este potrivit ca intrare(input)\n"
 "pentru \"xargs - 0\".\n"
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 "  -i, --input=FIªIER_INTRARE ...           fiºier de intrare(input) PO\n"
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr "scriere la stdout eºuatã"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "scrierea în subprocesul %s eºuatã"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr "lipseºte numele de filtru"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "cel puþin un script sed trebuie specificat"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Folosire: %s [OPÞIUNE] FILTRU [OPÞIUNE-FILTRU]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Aplicã un filtru pe toate traducerile unui catalog de traduceri.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1644,12 +1672,12 @@ msgstr ""
 "FILTRU poate fi orice program care citeºte de la intrarea(input) standard\n"
 "ºi scrie traducerea modificatã la ieºirea(output) standard.\n"
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "OPÞIUNi de FILTRU folositoare atunci când FILTRU este 'sed':\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
@@ -1657,7 +1685,7 @@ msgstr ""
 "  -e, --expression=SCRIPT     adaugã SCRIPTul la comenzile ce vor fi "
 "executate\n"
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1667,7 +1695,7 @@ msgstr ""
 "  -f, --file=FIªIERSCRIPT       adaugã conþinutul FIªIERSCRIPT la comenzile\n"
 "                                ce vor fi executate\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1675,7 +1703,7 @@ msgstr ""
 "  -n, --quiet, --silent       suprimã tipãrirea automatã a spaþiului model"
 "(pattern)\n"
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1683,13 +1711,13 @@ msgstr ""
 "     --no-escape                nu foloseºte escape-uri C în output "
 "(implicit)\n"
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 "      --indent                   scrie fiºierul .po folosind stil indentat\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1697,100 +1725,100 @@ msgstr ""
 "      --keep-header           pãstreazã headerul nemodificat, nu îl "
 "filtreazã\n"
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr "Neimplimentat încã."
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "nu se poate seta I/O neblocant pentru subprocesul %s"
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "comunicaþia cu subprocesul %s a eºuat"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "citirea din subprocesul %s a eºuat"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "subprocesul %s s-a terminat cu cod de ieºire %d"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentul lui %s ar trebui sã fie un singur caracter de punctuaþie"
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s necesitã specificarea \"-d director\""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s necesitã specificarea \"-l localizare\""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s e valid doar cu %s sau cu %s"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s e valid doar cu %s sau cu %s"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mesaj tradus"
 msgstr[1] "%d mesaje traduse"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducere aproximativã(fuzzy)"
 msgstr[1] ", %d traduceri aproximative(fuzzy)"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mesaj netradus"
 msgstr[1] ", %d mesaje netraduse"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Folosire: %s [OPÞIUNE] numefiºier.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genereazã un catalog binar de mesaje din descriere de traducere textualã\n"
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1799,17 +1827,17 @@ msgstr ""
 "Argumentele obligatorii pentru opþiunile lungi sunt obligatorii ºi pentru opþiunile\n"
 "scurte. Similar pentru argumentele opþionale.\n"
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  numefiºier.po ...             fiºiere de intrare(input)\n"
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mod de operare:\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1818,7 +1846,7 @@ msgstr ""
 "  -j, --java                  Mod Java: genereazã o clasã Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1827,54 +1855,54 @@ msgstr ""
 "      --java2                 precum --java, ºi presupune Java2 (JDK 1.2 sau "
 "ulterior)\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --qt                   Mod Qt: genereazã un fiºier .qm Qt\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr "      --qt                   Mod Qt: genereazã un fiºier .qm Qt\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Mod tcl: genereazã un fiºier tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                   Mod Qt: genereazã un fiºier .qm Qt\n"
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                activeazã modul strict Uniforum\n"
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Dacã fiºierul de ieºire(output) este -, output-ul este scris la ieºirea "
 "standard.\n"
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Locaþie fiºier output în mod Java:\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESURSÃ     nume resursã\n"
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1883,14 +1911,14 @@ msgstr ""
 "  -l, --locale=LOCALIZARE         nume localizare, fie limbã, "
 "fie                                                 limbã_ÞARÃ\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTOR                 directorul de bazã al ierarhiei directoarelor\n"
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1903,12 +1931,12 @@ msgstr ""
 "separatã de liniuþã_jos.  Opþiunea -d este obligatorie.  Clasa este\n"
 "scrisã în directorul specificat.\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Locaþie fiºier output în mod Tcl:\n"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, fuzzy, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1916,7 +1944,7 @@ msgid ""
 msgstr ""
 "  -d DIRECTOR                 directorul de bazã al ierarhiei directoarelor\n"
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, fuzzy, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1926,19 +1954,19 @@ msgstr ""
 "directorul\n"
 "specificat\n"
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Locaþie fiºier output în mod Tcl:\n"
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTOR                 directorul de bazã al cataloagelor de mesaje ."
 "msg\n"
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1948,12 +1976,12 @@ msgstr ""
 "directorul\n"
 "specificat\n"
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretare fiºier de intrarea(input):\n"
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1964,13 +1992,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          verificã ºirurile format dependent de limbaj\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -1978,7 +2006,7 @@ msgid ""
 msgstr ""
 "      --check-header          verificã prezenþa ºi conþinutul header-ului\n"
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1988,7 +2016,7 @@ msgstr ""
 "directivele\n"
 "                                de domenii ºi opþiunea --output-file\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1997,7 +2025,7 @@ msgstr ""
 "  -C, --check-compatibility   verificã dacã GNU msgfmt se comportã ca X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2008,14 +2036,14 @@ msgstr ""
 "tastaturã\n"
 "                                pentru elementele meniului\n"
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             foloseºte intrãri parþial traduse la ieºire"
 "(output)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2023,88 +2051,88 @@ msgstr ""
 "  -a, --alignment=NUMÃR      aliniazã ºirurile la NUMÃR octeþi (implicit: %"
 "d)\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               fiºierul binar nu va include tabela de hash\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            afiºeazã statistici despre traduceri\n"
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               mãreºte nivelul de detaliere\n"
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "avertisment: headerul fiºierului PO lipseºte sau este invalid\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "avertisment: conversia setului de caractere nu va funcþiona\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "avertisment: headerul fiºierului PO este neclar(fuzzy)\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "avertisment: versiunile mai vechi ale msgfmt ar putea aici raporta o eroare\n"
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "numele de domeniu \"%s\" nu este potrivit ca nume fiºier"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "numele de domeniu \"%s\" nu este potrivit ca nume de fiºier: se va utiliza "
 "prefix"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "directiva `domain %s' ignoratã"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "intrarea `msgstr' vidã ignoratã"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "intrarea `msgstr' neclarã(fuzzy) ignoratã"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: avertisment: fiºierul sursã conþine traduceri aproximative(fuzzy)"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "eroare în timpul citirii \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2112,7 +2140,7 @@ msgid ""
 msgstr ""
 "opþiunea '%c' nu poate fi folositã înainte ca 'K' sau 'T' sã fie specificate"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2121,7 +2149,7 @@ msgstr ""
 "Extrage toate mesajele unui catalog care se potriveºte unui tipar dat\n"
 "sau care e dependent de fiºiere sursã date.\n"
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2187,7 +2215,7 @@ msgstr ""
 "  -f, --file=FIªIER             obþine TIPAR din FIªIER\n"
 "  -i, --ignore-case           ignorã distincþia de caz\n"
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2195,18 +2223,18 @@ msgstr ""
 "      --escape                   foloseºte escape-uri C în output, nu \n"
 "caractere extinse\n"
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "       --sort-output           genereazã output sortat\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "       --sort-by-file          sorteazã output-ul dupã locaþia fiºierului\n"
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2216,7 +2244,7 @@ msgstr ""
 "variabila voastrã de mediu LANG, în modul în care este descris în fiºierul\n"
 "ABOUT-NLS.  Aceasta este necesar pentru a vã testa traducerile.\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2227,12 +2255,12 @@ msgstr ""
 "Specificaþi localizarea prin opþiunea --locale sau\n"
 "fiºierul de ieºire(output) .po prin opþiunea --output-file.\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "S-a creat %s.\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2241,12 +2269,12 @@ msgstr ""
 "Creazã un nou fiºer PO, iniþializând informaþiile meta cu valori pentru\n"
 "mediul utilizatorului.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FIªIER_INTRARE       fiºierul de intrare POT\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2258,13 +2286,13 @@ msgstr ""
 "fiºierul POT.\n"
 "Dacã acesta este -, se va citi intrarea(input) standard.\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FIªIER      scrie output-ul spre fiºierul PO specificat\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2275,12 +2303,12 @@ msgstr ""
 "sau de setãrile de localizare ale utilizatorului.\n"
 "Dacã este -, rezultatele vor fi scrise la ieºirea(output) standard.\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          seteazã localizarea þintã\n"
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2288,7 +2316,7 @@ msgstr ""
 "      --no-translator         se presupune cã fiºierul PO este generat "
 "automat\n"
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2296,12 +2324,12 @@ msgstr ""
 "S-a gãsit mai mult de un fiºier .pot.\n"
 "Specificaþi fiºierul de intrare .pot prin opþiunea --input.\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "eroare în citirea directorului curent"
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2309,14 +2337,14 @@ msgstr ""
 "Nu s-a gãsit nici un fiºier .pot în directorul curent.\n"
 "Vã rugãm specificaþi fiºierul de intrare .pot prin opþiunea --input.\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "subprocesul %s a eºuat cu cod de ieºire %d"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2333,26 +2361,26 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traducerea în limba românã pentru pachetul %s"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "setul de caractere prezent \"%s\" nu este un nume de codare(encoding) "
 "portabil"
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 "douã seturi diferite de caractere \"%s\" ºi \"%s\" în fiºierul de intrare"
 "(input)"
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -2360,7 +2388,7 @@ msgstr ""
 "fiºierul de intrare(input) `%s' nu conþine un header cu specificaþie de set "
 "de caractere"
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2369,20 +2397,20 @@ msgstr ""
 "domeniu \"%s\" din fiºierul de intrare `%s' nu conþine un header cu o "
 "specificaþie de set de caractere"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "setul de caractere þintã \"%s\" nu este un nume de codare(encoding) portabil."
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "avertisment: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2392,7 +2420,7 @@ msgstr ""
 "printre altele.\n"
 "Se converteºte ieºirea(output) în UTF-8.\n"
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2407,7 +2435,7 @@ msgstr ""
 "opþiunea\n"
 "--to-code.\n"
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2416,7 +2444,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2429,12 +2457,12 @@ msgstr ""
 "Output-ul lui '%s' poate fi incorect.\n"
 "Rezolvãri(workadrounds) posibile sunt:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Setare LC_ALL la o localizare cu codare(encoding) %s.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2445,7 +2473,7 @@ msgstr ""
 "  dupã care se aplicã '%s',\n"
 "  ºi apoi reconvertire în %s folosind 'msgconv'.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2458,7 +2486,7 @@ msgstr ""
 "  apoi aplicarea '%s',\n"
 "  dupã care se reconverteºte în %s folosind 'msgconv'.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2470,78 +2498,78 @@ msgstr ""
 "Output-ul lui '%s' poate fi incorect.\n"
 "O posibilã soluþie(workaround) este setarea LC_ALL=C.\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "expresiile plurale pot produce valori negative"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu dar expresiile plurale pot produce valori pânã la %lu"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "expresia pluralã poate produce împãrþire la zero"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "plural expression can produce depãºire(overflow) de întreg(integer)"
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 "expresia pluralã poate produce excepþii aritmetice, posibil împãrþire la zero"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Încercaþi sã folosiþi urmãtoarele, valide pentru %s:\n"
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "catalogul de mesaje are traduceri în forme plurale..."
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...dar header-ului îi lipseºte atributul \"plural=EXPRESSION\""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...dar header-ului îi lipseºte atributul \"plural=INTEGER\""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "valoare nplurals invalidã"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "expresie pluralã invalidã"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...dar câteva mesaje au doar o singurã formã pluralã"
 msgstr[1] "...dar câteva mesaje au doar %lu forme plurale"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...dar câteva mesaje au o singurã formã pluralã"
 msgstr[1] "...dar câteva mesaje au %lu forme plurale"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2549,84 +2577,84 @@ msgstr ""
 "catalogul de mesaje are traduceri de formã pluralã, dar îi lipseºte un "
 "header cu\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgid_plural' nu încep amândouã cu '\\n'"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr[%u]' nu încep amândouã cu '\\n'"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr' nu încep amândouã cu '\\n'"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgid_plural' nu se terminã amândouã cu '\\n'"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr[%u]' nu se terminã amândouã cu '\\n'"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr' nu se terminã amândouã cu '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "manipularea de plurale este o extensie a GNU gettext"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr nu are marcaj de accelerator de tastaturã '%c'"
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr are prea multe marcaje de acceleratoare tastaturã '%c'"
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "câmpul header '%s' lipseºte din header\n"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "câmpul header `%s' ar trebui sã înceapã la începutul liniei\n"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "câteva câmpuri de header ar trebui sã aibã valoare implicitã iniþialã\n"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "câmpul `%s' încã are valoarea implicitã iniþialã\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "eroare în timpul deschiderii \"%s\" pentru citire"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "fiºierul de intrare(input) nu conþine un header cu specificaþia unui set de "
 "caractere"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2635,7 +2663,7 @@ msgstr ""
 "Nu se poate converti din \"%s\" în \"%s\". %s se bazeazã pe inconv(), iar "
 "iconv() nu suportã aceastã conversie."
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2644,8 +2672,8 @@ msgstr ""
 "Conversia din \"%s\" în \"%s\" introduce duplicate: anumite msgid-uri "
 "diferite devin egale."
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2787,17 +2815,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprimã indicatorii de progres\n"
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "acest mesaj ar trebui sã defineascã formele plurale"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "acest mesaj nu ar trebui sã defineascã formele plurale"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2806,26 +2834,26 @@ msgstr ""
 "%sCitite %ld vechi + %ld referinþe, unite %ld, aproximãri %ld, lipsã %ld, "
 "învechite %ld.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " efectuat.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s ºi numele de fiºiere explicite se exclud reciproc"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Folosire: %s [OPÞIUNE] [FIªIER]...\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Converteºte catalogul de mesaje binar în fiºier .po stil Uniforum.\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2834,14 +2862,14 @@ msgstr ""
 "  -j, --java               mod Java: intrarea(input) este o clasã Java\n"
 "ResourceBundle\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --tcl                mod Tcl: intrarea(input) este un fiºier tcl/"
 "msgcat .msg\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2850,7 +2878,7 @@ msgstr ""
 "      --tcl                mod Tcl: intrarea(input) este un fiºier tcl/"
 "msgcat .msg\n"
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2858,17 +2886,17 @@ msgstr ""
 "      --tcl                mod Tcl: intrarea(input) este un fiºier tcl/"
 "msgcat .msg\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FIªIER ...                 fiºiere de intrare(input) .mo\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Locaþie fiºiere intrare în mod Java:\n"
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2879,12 +2907,12 @@ msgstr ""
 "resursei, separat de liniuþã_jos(underscore).  Clasa e localizatã folosind "
 "CLASSPATH.\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Locaþie fiºiere intrare în mod Tcl:\n"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, fuzzy, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2894,12 +2922,12 @@ msgstr ""
 "directorul\n"
 "specificat.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Locaþie fiºiere intrare în mod Tcl:\n"
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2909,18 +2937,18 @@ msgstr ""
 "directorul\n"
 "specificat.\n"
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent             scrie fiºierul .po folosind stil indentat\n"
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict                   scrie strict fiºiere conforme Uniforum\n"
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2942,12 +2970,12 @@ msgstr ""
 "Poziþiile din fiºier vor fi cumulate.  Dacã se foloseºte opþiunea --unique,\n"
 "duplicatele vor fi omise.\n"
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 afiºeazã doar duplicatele\n"
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2956,12 +2984,12 @@ msgstr ""
 " -u, --unique                   afiºeazã doar mesajele unice, omiþând "
 "duplicatele\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2972,7 +3000,7 @@ msgstr ""
 "nu\n"
 "funcþioneze.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2981,7 +3009,7 @@ msgstr ""
 "Setul de caractere \"%s\" nu este suportat. %s se bazeazã pe iconv(),\n"
 "iar iconv() nu suportã \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2989,15 +3017,15 @@ msgstr ""
 "Instalarea GNU libiconv ºi apoi reinstalarea GNU gettext\n"
 "va rezolva aceastã problemã.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Se continuã oricum, se aºteaptã analiza(parse) erorilor."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Se continuã oricum."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3006,7 +3034,7 @@ msgstr ""
 "Setul de caractere \"%s\" nu este suportat. %s se bazeazã pe iconv().\n"
 "Aceastã versiune a fost construitã(built) fãrã iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3015,151 +3043,151 @@ msgstr ""
 "Conversia de mesaje în setul de caractere al utilizatorului nu va "
 "funcþiona.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "folosire inconsistentã a #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "lipseºte secþiunea `msgstr[]'"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "lipseºte secþiunea `msgid_plural[]'"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "lipseºte secþiunea `msgstr'"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "primul plural are index nonzero"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "forma pluralã are index greºit"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "prea multe erori, se renunþã"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "secvenþã multibyte invalidã"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "secvenþã multibyte incompletã la sfârºitul fiºierului"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "secvenþã multibyte incompletã la sfârºitul liniei"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr "eroare iconv"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "cuvântul cheie \"%s\" este necunoscut"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "secvenþã de control invalidã"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "sfârºit de fiºier în ºir"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "sfârºit de linie în ºir"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "acest fiºier poate sã nu conþinã directive de domeniu"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "definiþie duplicatã de mesaj"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...aceasta este locaþia primei definiþii"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "fiºierul \"%s\" este trunchiat"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fiºierul \"%s\" conþine un ºir terminat non NUL"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fiºierul \"%s\" nu este în formatul GNU .mo"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "fiºierul \"%s\" conþine un ºir terminat non NUL, la %s"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%lu: avertisment: sintaxã invalidã \\uxxxx pentru caracter Unicode"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: avertisment: ºir neterminat"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s:%lu: avertisment: eroare de sintaxã"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%lu: avertisment: pereche cheie/valoare neterminatã"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%lu: avertisment: eroare de sintaxã, se aºtepta ';' dupã ºir"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
 "%s:%lu: avertisment: eroare de sintaxã, se aºtepta '=' sau ';' dupã ºir"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Scris de %s.\n"
@@ -3168,43 +3196,43 @@ msgstr "Scris de %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "eroare în timpul deschiderii \"%s\" pentru citire"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr "se aºteptau douã argumente"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Folosire: %s [OPÞIUNE] URL FIªIER\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3213,12 +3241,12 @@ msgstr ""
 "Aduce(fetches) ºi afiºeazã(outputs) conþinutul unui URL.  Dacã URL-ul nu poate\n"
 "fi accesat, se va folosi în loc FIªIERul accesibil local.\n"
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr "eroare în scrierea stdout"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3227,7 +3255,7 @@ msgstr ""
 "Nu se pot scrie mai multe domenii de traduceri într-un singur fiºier cu "
 "sintaxã .properties Java. Încercaþi sintaxa fiºierului PO în loc."
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3236,7 +3264,7 @@ msgstr ""
 "Nu se pot scrie mai multe domenii de traduceri într-un singur fiºier cu "
 "sintaxã .strings NeXTstep/GNUstep."
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
@@ -3245,7 +3273,7 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã, dar formatul de ieºire"
 "(output) nu le suportã."
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3255,7 +3283,7 @@ msgstr ""
 "(output) nu le suportã. Încercaþi generarea unei clase Java folosing "
 "\"msgfmt --java\", în locul unui fiºier de proprietãþi."
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3263,71 +3291,66 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã, dar formatul de ieºire"
 "(output) nu le suportã."
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "nu se poate crea fiºierul de ieºire(output) \"%s\""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "ieºire(output) standard"
 
-#: src/write-csharp.c:618
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"catalogul de mesaje are traduceri în formã pluralã,\n"
-"dar formatul catalogului de mesaje Qt nu suportã manipularea pluralelor\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "eroare în crearea \"%s\""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, fuzzy, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "compilarea clasei Java a eºuat, vã rugãm încercaþi --verbose sau setaþi "
 "$JAVAC"
 
-#: src/write-java.c:920
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
 msgstr ""
-"catalogul de mesaje are traduceri în formã pluralã,\n"
-"dar formatul catalogului de mesaje Qt nu suportã manipularea pluralelor\n"
+"compilarea clasei Java a eºuat, vã rugãm încercaþi --verbose sau setaþi "
+"$JAVAC"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nu este un nume valid de clasã Java: %s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "compilarea clasei Java a eºuat, vã rugãm încercaþi --verbose sau setaþi "
 "$JAVAC"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"compilarea clasei Java a eºuat, vã rugãm încercaþi --verbose sau setaþi "
+"$JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "eroare în deschiderea \"%s\" pentru scriere"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "mesajele internaþionalizate nu ar trebui sã conþinã secvenþa de escape `\\%c'"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3342,7 +3365,7 @@ msgstr ""
 "pur ASCII în loc.\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3357,7 +3380,7 @@ msgstr ""
 "pur ASCII în loc.\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3365,7 +3388,7 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã,\n"
 "dar formatul catalogului de mesaje Qt nu suportã manipularea pluralelor\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 #, fuzzy
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
@@ -3379,7 +3402,7 @@ msgstr ""
 "traduse,\n"
 "nu ºi in cele netraduse.\n"
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3391,12 +3414,12 @@ msgstr ""
 "traduse,\n"
 "nu ºi in cele netraduse.\n"
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "eroare în scrierea fiºierului \"%s\""
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3405,7 +3428,7 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã,\n"
 "dar formatul catalogului de mesaje Qt nu suportã manipularea pluralelor\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
@@ -3414,7 +3437,7 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã,\n"
 "dar formatul catalogului de mesaje Qt nu suportã manipularea pluralelor\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3423,7 +3446,7 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã,\n"
 "dar formatul catalogului de mesaje Tcl nu suportã manipularea pluralelor\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3431,27 +3454,27 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã,\n"
 "dar formatul catalogului de mesaje Tcl nu suportã manipularea pluralelor\n"
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: avertisment: ºir neterminat"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avertisment: expresie regulatã neterminatã"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: avertisment: constantã caracter neterminatã"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avertisment: ºir literal neterminat"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3460,7 +3483,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3469,7 +3492,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3478,7 +3501,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3487,7 +3510,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3496,12 +3519,12 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "eroare iconv"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3510,32 +3533,32 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: avertisment: caracter Unicode invalid"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: avertisment: ºir neterminat"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: avertisment: s-a gãsit ')' unde se aºtepta '}'"
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: avertisment: s-a gãsit '}' unde se aºtepta ')'"
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3544,43 +3567,48 @@ msgstr ""
 "Limbajul \"glade\" nu este suportat. %s se bazeazã pe expat.\n"
 "Aceastã versiune a fost construitã fãrã expat.\n"
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: avertisment: ºir neterminat"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: nu se poate gãsi terminatorul de ºir \"%s\" oriunde înainte de EOF"
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: lipseºte acoladã dreaptã în \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolare invalidã (\"\\l\") a caracterului pe 8biþi \"%c\""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolare invalidã (\"\\u\") a caracterului pe 8biþi \"%c\""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: interpolare invalidã de variabilã la \"%c\""
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolare invalidã (\"\\L\") a caracterului pe 8biþi  \"%c\""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolare invalidã (\"\\U\") a caracterului pe 8biþi  \"%c\""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, fuzzy, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3590,7 +3618,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3600,7 +3628,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3610,7 +3638,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3620,7 +3648,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3630,7 +3658,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3640,27 +3668,27 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definiþie invalidã de ºir"
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: lipseºte numãr dupã #"
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expresie ºir invalidã"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3669,30 +3697,30 @@ msgstr ""
 "%s:%lu: avertisment: sintaxa $\"...\" nu se mai foloseºte din motive de "
 "securitate; înlocuiþi cu eval_gettext"
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing nu poate fi folosit când output-ul este scris la stdout"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nu poate funcþiona fãrã cuvinte cheie dupã care sã caute"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "avertisment: fiºierul `%s' extensia `%s' este necunoscut(ã); se va încerca C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Extrage ºirurile traductibile din fiºierele de intrare(input) specificate.\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3701,13 +3729,13 @@ msgstr ""
 "  -d, --default-domain=NUME      foloseºte NUME.po pentru output \n"
 "(în loc de messages.po)\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FIªIER              scrie output-ul în fiºierul specificat\n"
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3716,12 +3744,12 @@ msgstr ""
 "în \n"
 "directorul DIR\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Alegerea limbajul fiºierelor de intrare(input):\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3739,12 +3767,12 @@ msgstr ""
 "                                JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      scurtãturã pentru --language=C++\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3754,7 +3782,7 @@ msgstr ""
 "intrare \n"
 "(input)\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3763,25 +3791,25 @@ msgstr ""
 "      --from-code=NUME        codare pentru fiºierele de intrare(input)\n"
 "                                (exceptând Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Implicit fiºierele de intrare(input) sunt presupuse a fi în ASCII.\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing            alãturã mesajele fiºierului existent\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FIªIER.po     intrãrile din FIªIER.po nu vor fi "
 "extrase\n"
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3793,17 +3821,17 @@ msgstr ""
 "                                 cuvinte cheie) în fiºierul de ieºire"
 "(output)\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opþiuni specifice limbajului:\n"
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              extrage toate ºirurile\n"
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3815,7 +3843,7 @@ msgstr ""
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                Tcl, Perl, PHP, GCC-sursã, Glade)\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3826,7 +3854,7 @@ msgstr ""
 "cuvintelor_cheie\n"
 "                                  implicite)\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3837,7 +3865,7 @@ msgstr ""
 "argumentul\n"
 "                              numãrul ARG al cuvântului cheie CUVÂNT\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3849,7 +3877,7 @@ msgstr ""
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                YCP, Tcl, Perl, PHP, GCC-sursã)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
@@ -3857,27 +3885,32 @@ msgstr ""
 "pentru intrare\n"
 "                                     (input)\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (doar limbajele C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recunoaºte formatul ºirurilor Qt\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (doar limbajul C++)\n"
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    recunoaºte formatul ºirurilor Qt\n"
+
+#: src/xgettext.c:863
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    recunoaºte formatul ºirurilor Qt\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3885,19 +3918,19 @@ msgstr ""
 "      --debug                    rezultat mai detaliat al recunoaºterii "
 "formatstring\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     scrie un fiºier .properties Java\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=ªIR  seteazã deþinãtorul copyright-ului la ieºire"
 "(output)\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3905,7 +3938,19 @@ msgstr ""
 "      --foreign-user          omite copyright FSF la ieºire pentru user "
 "strãin(foreign)\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+"      --copyright-holder=ªIR  seteazã deþinãtorul copyright-ului la ieºire"
+"(output)\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3913,7 +3958,7 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@ADRESÃ  seteazã adresa de reportare a\n"
 "bug-urilor msgid\n"
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3922,7 +3967,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=ªIR]  foloseºte ªIR sau \"\" ca prefix pentru "
 "intrãrile msgstr\n"
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3931,7 +3976,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=ªIR]  foloseºte ªIR sau \"\" ca suefix pentru "
 "intrãrile msgstr\n"
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3939,16 +3984,16 @@ msgid ""
 msgstr ""
 "Un argument --flag nu are sintaxa ::[pass-] : %s"
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "intrare(input) standard"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: avertisment: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3957,7 +4002,7 @@ msgstr ""
 "Deºi este folosit într-o poziþie de format a ºirului, %s nu este un format\n"
 "al ºirului valid %s. Motiv: %s\n"
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3966,7 +4011,7 @@ msgstr ""
 "Deºi este declarat astfel, %s nu este un format al ºirului valid %s: Motiv:\n"
 "%s\n"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3975,7 +4020,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3985,27 +4030,27 @@ msgstr ""
 "gettext(\"\") returneazã header-ul cu informaþii\n"
 "meta, nu cu ºirul vid.\n"
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4017,15 +4062,47 @@ msgstr ""
 "aici variabila MSGID_BUGS_ADDRESS; în caz contrar\n"
 "vã rugãm specificaþi optiunea --msgid-bugs-address în linia de comandã.\n"
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "limbajul `%s' este necunoscut"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Referinþe multiple la % % %c."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Acesta este software liber; citiþi sursa pentru condiþii de copiere.  NU "
+#~ "existã NICI o \n"
+#~ "garanþie; nici mãcar pentru VANDABILITATE sau MODIFICARE ÎNTR-UN SCOP "
+#~ "PRIVAT.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "catalogul de mesaje are traduceri în formã pluralã,\n"
+#~ "dar formatul catalogului de mesaje Qt nu suportã manipularea pluralelor\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "catalogul de mesaje are traduceri în formã pluralã,\n"
+#~ "dar formatul catalogului de mesaje Qt nu suportã manipularea pluralelor\n"
+
 #~ msgid "Which is your email address?"
 #~ msgstr "Care este adresa voastrã de email?"
 
diff --git a/gettext-tools/po/ru.po b/gettext-tools/po/ru.po
index 7ffb88d99..5f599cf28 100644
--- a/gettext-tools/po/ru.po
+++ b/gettext-tools/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-05-15 02:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-06-14 10:41+0400\n"
 "Last-Translator: Oleg S. Tihonov \n"
 "Language-Team: Russian \n"
@@ -16,88 +16,88 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ %s ÄÌÑ %s"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "ÎÅÏÄÎÏÚÎÁÞÎÙÊ ÁÒÇÕÍÅÎÔ %s ÄÌÑ %s"
 
-#: gnulib-lib/argmatch.c:154
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "äÏÐÕÓÔÉÍÙÅ ÁÒÇÕÍÅÎÔÙ:"
 
-#: gnulib-lib/clean-temp.c:334
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ×ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ, ÐÏÐÒÏÂÕÊÔÅ ÕÓÔÁÎÏ×ÉÔØ $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:348
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ Ó ÐÏÍÏÝØÀ ÛÁÂÌÏÎÁ \"%s\""
 
-#: gnulib-lib/clean-temp.c:444
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ %s"
 
-#: gnulib-lib/clean-temp.c:459
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ×ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ %s"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:55 src/msggrep.c:245
-#: src/open-catalog.c:122 src/read-mo.c:253 src/read-tcl.c:125
-#: src/urlget.c:201 src/xgettext.c:1750 src/xgettext.c:1763
-#: src/xgettext.c:1773
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÞÔÅÎÉÑ"
 
-#: gnulib-lib/copy-file.c:74
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÒÅÚÅÒ×ÎÏÇÏ ÆÁÊÌÁ \"%s\" ÄÌÑ ÚÁÐÉÓÉ"
 
-#: gnulib-lib/copy-file.c:82 src/urlget.c:213
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ \"%s\""
 
-#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:92
-#: gnulib-lib/copy-file.c:131
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ \"%s\""
 
-#: gnulib-lib/copy-file.c:94 gnulib-lib/copy-file.c:133 src/urlget.c:223
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "ÏÛÉÂËÁ ÐÏÓÌÅ ÞÔÅÎÉÑ \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:840
-#: src/msginit.c:908 src/msginit.c:1068 src/msginit.c:1151
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "×ÙÚÏ× fdopen() ÎÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ"
 
-#: gnulib-lib/csharpcomp.c:540
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "îÅ ÎÁÊÄÅÎ ËÏÍÐÉÌÑÔÏÒ C#, ÐÏÐÒÏÂÕÊÔÅ ÐÏÓÔÁ×ÉÔØ pnet"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "îÅ ÎÁÊÄÅÎÁ ×ÉÒÔÕÁÌØÎÁÑ ÍÁÛÉÎÁ C#, ÐÏÐÒÏÂÕÊÔÅ ÐÏÓÔÁ×ÉÔØ pnet"
@@ -106,122 +106,122 @@ msgstr "
 msgid "Unknown system error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
 
-#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:261 gnulib-lib/execute.c:303
-#: gnulib-lib/pipe.c:230 gnulib-lib/pipe.c:348 gnulib-lib/pipe.c:408
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: gnulib-lib/javacomp.c:128 gnulib-lib/javacomp.c:142
-#: gnulib-lib/javacomp.c:158
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ source_version ÄÌÑ compile_java_class"
 
-#: gnulib-lib/javacomp.c:173 gnulib-lib/javacomp.c:194
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ target_version ÄÌÑ compile_java_class"
 
-#: gnulib-lib/javacomp.c:505 src/write-csharp.c:714 src/write-java.c:988
-#: src/write-java.c:1000
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "ÐÏÐÙÔËÁ ÓÏÚÄÁÎÉÑ \"%s\" ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ"
 
-#: gnulib-lib/javacomp.c:512 src/write-catalog.c:254 src/write-catalog.c:318
-#: src/write-csharp.c:723 src/write-java.c:1009 src/write-mo.c:812
-#: src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ \"%s\""
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "îÅ ÎÁÊÄÅÎ ËÏÍÐÉÌÑÔÏÒ Java, ÐÏÓÔÁ×ØÔÅ gcj ÉÌÉ ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ $JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "îÅ ÎÁÊÄÅÎÁ ×ÉÒÔÕÁÌØÎÁÑ ÍÁÛÉÎÁ Java, ÐÏÓÔÁ×ØÔÅ gij ÉÌÉ ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:848 src/msginit.c:916
-#: src/msginit.c:1076
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "ÏÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ × ÄÏÞÅÒÎÅÍ ÐÒÏÃÅÓÓÅ %s"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:39 src/msgl-check.c:452 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:436 libgettextpo/gettext-po.c:1245
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "ÏÐÅÒÁÔÉ×ÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
 
-#: gnulib-lib/pipe.c:156 gnulib-lib/pipe.c:159 gnulib-lib/pipe.c:263
-#: gnulib-lib/pipe.c:266
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÎÁÌ"
@@ -245,74 +245,74 @@ msgstr "
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:230
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "ÏÐÅÒÁÃÉÑ DuplicateHandle ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ 0x%08x"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "ÏÐÅÒÁÃÉÑ _open_osfhandle ÎÅÕÓÐÅÛÎÁ"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÐÏÌÕÞÉÌ ÆÁÔÁÌØÎÙÊ ÓÉÇÎÁÌ %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 "'%s' ÎÅ Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÏÊ ÆÏÒÍÁÔÎÏÊ ÓÔÒÏËÏÊ %s × ÏÔÌÉÞÉÅ ÏÔ 'msgid'.  "
 "ðÒÉÞÉÎÁ: %s"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:624 src/format-librep.c:313
-#: src/format-pascal.c:402 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:138 src/format-tcl.c:391 src/format-ycp.c:145
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "× 'msgid' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%u' ËÁË × '%s'"
 
-#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:634 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
-#: src/format-qt.c:137 src/format-tcl.c:401 src/format-ycp.c:144
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ %u × '%s' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:911
-#: src/format-elisp.c:379 src/format-gcc-internal.c:654
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
-#: src/format-php.c:381 src/format-python.c:511 src/format-tcl.c:421
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "× `msgid' É `%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %u"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "äÉÒÅËÔÉ×Á ÎÏÍÅÒ %u ÎÁÞÉÎÁÅÔÓÑ Ó |, ÎÏ ÎÅ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ |."
 
-#: src/format-c.c:182
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -322,73 +322,73 @@ msgstr ""
 "ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ.  äÏÐÕÓÔÉÍÙÅ ÉÍÅÎÁ ÍÁËÒÏÓÏ× ÐÅÒÅÞÉÓÌÅÎÙ × ISO C 99, "
 "ÒÁÚÄÅÌ  7.8.1."
 
-#: src/format-c.c:589
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÏÓÌÅ ÌÅËÓÅÍÙ, ÓÔÏÑÝÅÊ ÚÁ '<', ÎÅÔ ÚÁËÒÙ×ÁÀÝÅÇÏ '>'."
 
-#: src/format-c.c:815
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÁÒÇÕÍÅÎÔ ÎÏÍÅÒ %u, ÎÏ ÉÇÎÏÒÉÒÕÅÔ ÁÒÇÕÍÅÎÔ ÎÏÍÅÒ %u."
 
-#: src/format-c.c:902 src/format-csharp.c:207 src/format-python.c:502
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "ÎÅ ÓÏ×ÐÁÄÁÅÔ ÞÉÓÌÏ ÓÐÅÃÉÆÉËÁÃÉÊ ÆÏÒÍÁÔÁ ÐÅÞÁÔÉ × `msgid' É `%s'"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÏÓÌÅ '{' ÎÅ ÓÔÏÉÔ ÎÏÍÅÒ ÁÒÇÕÍÅÎÔÁ."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÏÓÌÅ ',' ÎÅ ÓÔÏÉÔ ÞÉÓÌÏ."
 
-#: src/format-csharp.c:131 src/format-java.c:192
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 "óÔÒÏËÁ ÏÂÒÙ×ÁÅÔÓÑ ÐÏÓÒÅÄÉ ÄÉÒÅËÔÉ×Ù: ÎÁÊÄÅÎÁ '{' ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ '}'."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "äÉÒÅËÔÉ×Á ÎÏÍÅÒ %u ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÎÅ×ÅÒÎÙÊ ÚÎÁË '%c', Á ÎÅ ÎÁ '}'."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "äÉÒÅËÔÉ×Á ÎÏÍÅÒ %u ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÎÅ×ÅÒÎÙÊ ÚÎÁË, Á ÎÅ ÎÁ '}'."
 
-#: src/format-csharp.c:162 src/format-java.c:347
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 "óÔÒÏËÁ ÎÁÞÉÎÁÅÔÓÑ ÐÏÓÒÅÄÉ ÄÉÒÅËÔÉ×Ù: ÎÁÊÄÅÎÁ '}' ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ '{'."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "óÔÒÏËÁ ÓÏÄÅÒÖÉÔ ÎÅÐÁÒÎÕÀ '}' ÐÏÓÌÅ ÄÉÒÅËÔÉ×Ù ÎÏÍÅÒ %u."
 
-#: src/format-gcc-internal.c:254
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÎÅ×ÅÒÎÁÑ ËÏÍÂÉÎÁÃÉÑ ÆÌÁÇÏ×."
 
-#: src/format-gcc-internal.c:291 src/format-gcc-internal.c:397
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÅÒÅÄ '%c' ÎÅÌØÚÑ ÕËÁÚÙ×ÁÔØ ÔÏÞÎÏÓÔØ."
 
-#: src/format-gcc-internal.c:333
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -396,31 +396,38 @@ msgid ""
 msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÎÏÍÅÒ ÁÒÇÕÍÅÎÔÁ ÄÌÑ ÔÏÞÎÏÓÔÉ ÄÏÌÖÅÎ ÂÙÔØ ÒÁ×ÅÎÏ %u."
 
-#: src/format-gcc-internal.c:405
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÅÒÅÄ '%c' ÎÅÌØÚÑ ÕËÁÚÙ×ÁÔØ ÔÏÞÎÏÓÔØ."
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÎÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ÔÏÞÎÏÓÔÉ."
 
-#: src/format-gcc-internal.c:460
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÅÒÅÄ '%c' ÎÅÌØÚÑ ÐÉÓÁÔØ ÆÌÁÇÉ."
 
-#: src/format-gcc-internal.c:672
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "÷ 'msgid' ÉÓÐÏÌØÚÕÅÔÓÑ %%m, ÎÏ × '%s' ÎÅÔ"
 
-#: src/format-gcc-internal.c:675
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "÷ 'msgid' ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ %%m, ÎÏ × '%s' ÉÓÐÏÌØÚÕÅÔÓÑ"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "óÔÒÏËÁ ÏÂÒÙ×ÁÅÔÓÑ ÐÏÓÒÅÄÉ ÄÉÒÅËÔÉ×Ù."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -428,27 +435,27 @@ msgstr ""
 "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÁÒÇÕÍÅÎÔÙ ËÁË ÐÏ ÁÂÓÏÌÀÔÎÙÍ ÎÏÍÅÒÁÍ, ÔÁË É ÞÅÒÅÚ "
 "ÎÅÎÅÕÍÅÒÏ×ÁÎÎÙÅ ÓÐÅÃÉÆÉËÁÃÉÉ ÁÒÇÕÍÅÎÔÏ×."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr ""
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
@@ -456,7 +463,7 @@ msgid ""
 msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å %u ÚÎÁË '%c' ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ÓÐÅÃÉÆÉËÁÔÏÒÏÍ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -465,12 +472,12 @@ msgstr ""
 "úÎÁË, ÚÁ×ÅÒÛÁÀÝÉÊ ÄÉÒÅËÔÉ×Õ ÎÏÍÅÒ %u ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ÓÐÅÃÉÆÉËÁÔÏÒÏÍ "
 "ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÁÒÇÕÍÅÎÔ ÎÏÍÅÒ %u ÎÅÓÏ×ÍÅÓÔÉÍÙÍ ÏÂÒÁÚÏÍ."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -478,18 +485,18 @@ msgid ""
 msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÏÄÓÔÒÏËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ÓÔÉÌÅÍ ÄÁÔÙ/×ÒÅÍÅÎÉ."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÏÓÌÅ \"%s\" ÎÅ ÓÔÏÉÔ ÚÁÐÑÔÁÑ."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÏÄÓÔÒÏËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ÓÔÉÌÅÍ ÞÉÓÌÁ."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -498,12 +505,12 @@ msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÏÓÌÅ ÎÏÍÅÒÁ ÁÒÇÕÍÅÎÁ ÎÅ ÓÔÏÉÔ ÚÁÐÑÔÁÑ É ÏÄÎÏ ÉÚ \"%s"
 "\", \"%s\", \"%s\", \"%s\"."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÏÐÅÒÁÔÏÒ ×ÙÂÏÒÁ ÎÅ ÓÏÄÅÒÖÉÔ ÎÏÍÅÒÁ."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -512,26 +519,26 @@ msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÏÐÅÒÁÔÏÒ ×ÙÂÏÒÁ ÓÏÄÅÒÖÉÔ ÞÉÓÌÏ, ÚÁ ËÏÔÏÒÙÍ ÎÅ ÓÌÅÄÕÅÔ "
 "'<', '#' ÉÌÉ '%s'."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%u' × 'msgid' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ËÁË × '%s'"
 
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ {%u} ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × '%s'"
 
-#: src/format-java.c:776
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "× 'msgid' É '%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ {%u}"
 
-#: src/format-lisp.c:2338 src/format-lisp.c:2350 src/format-scheme.c:2364
-#: src/format-scheme.c:2376
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -540,7 +547,7 @@ msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÁÒÁÍÅÔÒ %u ÐÒÉÎÁÄÌÅÖÉÔ ÔÉÐÕ '%s', ÎÏ ÏÖÉÄÁÅÔÓÑ "
 "ÐÁÒÁÍÅÔÒ ÔÉÐÁ '%s'."
 
-#: src/format-lisp.c:2373 src/format-scheme.c:2399
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -551,33 +558,33 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2497 src/format-scheme.c:2500
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÏÓÌÅ '%c' ÎÅ ÓÔÏÉÔ ÃÉÆÒÁ."
 
-#: src/format-lisp.c:2737 src/format-scheme.c:2755
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÁÒÇÕÍÅÎÔ %d ÏÔÒÉÃÁÔÅÌÅÎ."
 
-#: src/format-lisp.c:2806
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "óÔÒÏËÁ ÏÂÒÙ×ÁÅÔÓÑ ÐÏÓÒÅÄÉ ÄÉÒÅËÔÉ×Ù ~/.../."
 
-#: src/format-lisp.c:2844 src/format-lisp.c:3109 src/format-lisp.c:3226
-#: src/format-lisp.c:3286 src/format-lisp.c:3398 src/format-scheme.c:2841
-#: src/format-scheme.c:3106 src/format-scheme.c:3223 src/format-scheme.c:3321
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "÷ÓÔÒÅÞÅÎÏ '~%c' ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ '~%c'."
 
-#: src/format-lisp.c:2864 src/format-scheme.c:2861
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÏÄÎÏ×ÒÅÍÅÎÎÏ ÚÁÄÁÎÙ ÍÏÄÉÆÉËÁÔÏÒÙ @ É :."
 
-#: src/format-lisp.c:2977 src/format-scheme.c:2974
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -585,28 +592,28 @@ msgid ""
 msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÏÓÌÅ '~:[' ÎÅ ÓÔÏÑÔ Ä×Á ÐÒÅÄÌÏÖÅÎÉÑ, ÒÁÚÄÅÌÅÎÎÙÅ '~;'."
 
-#: src/format-lisp.c:3327 src/format-scheme.c:3264
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u '~;' ÉÓÐÏÌØÚÏ×ÁÎÁ × ÎÅ×ÅÒÎÏÍ ÍÅÓÔÅ."
 
-#: src/format-lisp.c:3433 src/format-scheme.c:3356
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ËÁËÏÊ-ÔÏ ÁÒÇÕÍÅÎÔ ÎÅÓÏ×ÍÅÓÔÉÍÙÍ ÏÂÒÁÚÏÍ."
 
-#: src/format-lisp.c:3475 src/format-scheme.c:3398
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × `msgid' É `%s' ÎÅ ÜË×É×ÁÌÅÎÔÎÙ"
 
-#: src/format-lisp.c:3491 src/format-scheme.c:3414
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr ""
 "ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × '%s' ÎÅ Ñ×ÌÑÀÔÓÑ ÐÏÄÍÎÏÖÅÓÔ×ÏÍ ÓÐÅÃÉÆÉËÁÃÉÊ ÉÚ "
 "'msgid' "
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -615,12 +622,12 @@ msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÓÐÅÃÉÆÉËÁÔÏÒ ÒÁÚÍÅÒÁ ÎÅÓÏ×ÍÅÓÔÉÍ ÓÏ ÓÐÅÃÉÆÉËÁÔÏÒÏÍ "
 "ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ '%c'."
 
-#: src/format-perl-brace.c:200 src/format-python.c:460 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%s' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × '%s'"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -628,49 +635,51 @@ msgstr ""
 "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÁÒÇÕÍÅÎÔÙ ËÁË ÐÏ ÉÍÅÎÁÍ, ÔÁË É ÐÏ ÎÅÉÍÅÎÏ×ÁÎÙÍ "
 "ÓÐÅÃÉÆÉËÁÃÉÑÍ ÁÒÇÕÍÅÎÔÏ×."
 
-#: src/format-python.c:344
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÁÒÇÕÍÅÎÔ ÐÏ ÉÍÅÎÉ '%s' ÎÅÓÏ×ÍÅÓÔÉÍÙÍ ÏÂÒÁÚÏÍ."
 
-#: src/format-python.c:420
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 "tuple"
 msgstr "ÓÐÅÃÉÆÉËÁÃÉÑ ÆÏÒÍÁÔÁ × 'msgid' ÏÖÉÄÁÅÔ ÏÔÏÂÒÁÖÅÎÉÅ, Á × '%s' -- ËÏÒÔÅÖ"
 
-#: src/format-python.c:427
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 "mapping"
 msgstr "ÓÐÅÃÉÆÉËÁÃÉÑ ÆÏÒÍÁÔÁ × 'msgid' ÏÖÉÄÁÅÔ ËÏÒÔÅÖ, Á × '%s' -- ÏÔÏÂÒÁÖÅÎÉÅ"
 
-#: src/format-python.c:450 src/format-sh.c:298
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "× 'msgid' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%s', ËÁË × '%s'"
 
-#: src/format-python.c:480
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "× 'msgid' É '%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %s"
 
-#: src/format-qt.c:81
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "íÎÏÖÅÓÔ×ÅÎÎÙÅ ÓÓÙÌËÉ ÎÁ %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÐÅÒÅÍÅÎÎÕÀ ÏÂÏÌÏÞËÉ Ó ÉÍÅÎÅÍ, ÎÅ ÐÒÅÄÓÔÁ×ÉÍÙÍ × ASCII."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -679,7 +688,7 @@ msgstr ""
 "ÓËÏÂÏË.  üÔÏÔ ÓÉÎÔÁËÔÉÓ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ × ÜÔÏÊ ÐÒÏÇÒÁÍÍÅ ÐÏ ÓÏÏÂÒÁÖÅÎÉÑÍ "
 "ÂÅÚÏÐÁÓÎÏÓÔÉ."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
@@ -687,45 +696,42 @@ msgstr ""
 "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÐÅÒÅÍÅÎÎÕÀ ÏÂÏÌÏÞËÉ, ÞØÅ ÚÎÁÞÅÎÉÅ ÍÏÖÅÔ ÏËÁÚÁÔØÓÑ ÉÎÙÍ "
 "×ÎÕÔÒÉ ÆÕÎËÃÉÊ ÏÂÏÌÏÞËÉ."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÐÅÒÅÍÅÎÎÕÀ ÏÂÏÌÏÞËÉ Ó ÐÕÓÔÙÍ ÉÍÅÎÅÍ."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÚÎÁË '%c' ÎÅ Ñ×ÌÑÅÔÓÑ ÃÉÆÒÏÊ ÍÅÖÄÕ 1 É 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr "úÎÁË, ÚÁ×ÅÒÛÁÀÝÉÊ ÄÉÒÅËÔÉ×Õ ÎÏÍÅÒ %u ÎÅ Ñ×ÌÑÅÔÓÑ ÃÉÆÒÏÊ ÍÅÖÄÕ 1 É 9."
 
-#: src/hostname.c:179 src/msgattrib.c:326 src/msgcat.c:282 src/msgcmp.c:162
-#: src/msgcomm.c:269 src/msgconv.c:224 src/msgen.c:212 src/msgexec.c:179
-#: src/msgfilter.c:281 src/msgfmt.c:365 src/msggrep.c:399 src/msginit.c:258
-#: src/msgmerge.c:320 src/msgunfmt.c:251 src/msguniq.c:248
-#: src/recode-sr-latin.c:111 src/urlget.c:131 src/xgettext.c:509
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"üÔÏ Ó×ÏÂÏÄÎÁÑ ÐÒÏÇÒÁÍÍÁ; ÐÏÄÒÏÂÎÏÓÔÉ Ï ÕÓÌÏ×ÉÑÈ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ\n"
-"× ÉÓÈÏÄÎÏÍ ÔÅËÓÔÅ.  íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ; ÄÁÖÅ ÇÁÒÁÎÔÉÊ\n"
-"ëïííåòþåóëïê ãåîîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n"
 
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
 #: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:263
-#: src/msgmerge.c:325 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:514
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "á×ÔÏÒ ÐÒÏÇÒÁÍÍÙ -- %s.\n"
@@ -733,26 +739,26 @@ msgstr "
 #. This is a proper name. See the gettext manual, section Names.
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
 #: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:263 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
 #: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr "âÒÕÎÏ èÁÊÂÌÅ"
 
-#: src/hostname.c:194 src/msginit.c:273 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
 
 #: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
 #: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:347
-#: src/msgmerge.c:446 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:730
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
 
-#: src/hostname.c:211 src/msginit.c:351 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]\n"
@@ -790,27 +796,27 @@ msgstr "  -i, --ip-address            
 
 #: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
 #: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:403
-#: src/msgmerge.c:563 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:880
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "éÎÆÏÒÍÁÃÉÏÎÎÙÊ ×Ù×ÏÄ:\n"
 
 #: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
 #: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:405
-#: src/msgmerge.c:565 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:882
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n"
 
 #: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
 #: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:407
-#: src/msgmerge.c:567 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:884
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
@@ -821,9 +827,9 @@ msgstr "  -V, --version               
 #. bugs (typically your translation team's web or email address).
 #: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
 #: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:414
-#: src/msgmerge.c:578 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:891
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ .\n"
 
@@ -832,8 +838,8 @@ msgstr "
 msgid "could not get host name"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÍÑ ÍÁÛÉÎÙ"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:151 src/msgfilter.c:211
-#: src/msggrep.c:419 src/msginit.c:196 src/msguniq.c:268
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "ÐÒÉÎÉÍÁÅÔÓÑ ÎÅ ÂÏÌÅÅ ÏÄÎÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ"
@@ -842,9 +848,10 @@ msgstr "
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
 #: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
 #: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:350 src/msgmerge.c:371
-#: src/msgmerge.c:375 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:524 src/xgettext.c:528 src/xgettext.c:535
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s É %s ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÔ ÄÒÕÇ ÄÒÕÇÁ"
@@ -865,7 +872,7 @@ msgstr ""
 
 #: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
 #: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:361 src/msgmerge.c:467 src/msgunfmt.c:423
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
@@ -875,8 +882,8 @@ msgstr ""
 
 #: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
 #: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:364 src/msgmerge.c:470
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:748
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ:\n"
@@ -888,8 +895,8 @@ msgstr "  
 
 #: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
 #: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:476 src/msguniq.c:336
-#: src/xgettext.c:754
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -905,21 +912,21 @@ msgstr ""
 
 #: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
 #: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:372 src/msgmerge.c:488 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:759
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ:\n"
 
 #: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
 #: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:490 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=æáêì      ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × ÕËÁÚÁÎÎÙÊ ÆÁÊÌ\n"
 
 #: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:492
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -1036,14 +1043,14 @@ msgstr ""
 
 #: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
 #: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:380 src/msgmerge.c:525
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "óÉÎÔÁËÓÉÓ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ:\n"
 
 #: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:382 src/msguniq.c:358
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1051,7 +1058,7 @@ msgstr ""
 "  -P, --properties-input      ×ÈÏÄÎÏÊ ÆÁÊÌ ÉÍÅÅÔ ÓÉÎÔÁËÓÉÓ Java .properties\n"
 
 #: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:384 src/msguniq.c:360
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1062,15 +1069,15 @@ msgstr ""
 
 #: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
 #: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:387 src/msgmerge.c:533 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:838
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "ðÏÄÒÏÂÎÏÓÔÉ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ:\n"
 
 #: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:535 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:840
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1080,8 +1087,8 @@ msgstr ""
 "ÕÍÏÌÞÁÎÉÀ)\n"
 
 #: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:537 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:842
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1090,27 +1097,27 @@ msgstr ""
 "                                ÒÁÓÛÉÒÅÎÎÙÅ ÚÎÁËÉ\n"
 
 #: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:539
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:844
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              ÚÁÐÉÓÁÔØ PO-ÆÁÊÌ, ÄÁÖÅ ÅÓÌÉ ÏÎ ÐÕÓÔ\n"
 
 #: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:846
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                ÆÏÒÍÁÔÉÒÏ×ÁÔØ PO-ÆÁÊÌ, ÉÓÐÏÌØÚÕÑ ÏÔÓÔÕÐÙ\n"
 
 #: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:848
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           ÎÅ ÐÉÓÁÔØ ÓÔÒÏËÉ '#: ÆÁÊÌ:ÓÔÒÏËÁ'\n"
 
 #: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:850
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1119,7 +1126,7 @@ msgstr ""
 "ÕÍÏÌÞÁÎÉÀ)\n"
 
 #: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:852
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1129,15 +1136,15 @@ msgstr ""
 "                                Uniforum\n"
 
 #: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:393
-#: src/msgmerge.c:549 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     ÚÁÐÉÓÁÔØ .properties-ÆÁÊÌ Java\n"
 
 #: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:395
-#: src/msgmerge.c:551 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:856
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1145,15 +1152,15 @@ msgstr ""
 "      --stringtable-output    ÚÁÐÉÓÁÔØ .strings-ÆÁÊÌ NeXTstep/GNUstep\n"
 
 #: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:397
-#: src/msgmerge.c:553 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:858
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=þéóìï           ÚÁÄÁÅÔ ÛÉÒÉÎÕ ×ÙÈÏÄÎÏÊ ÓÔÒÁÎÉÃÙ\n"
 
 #: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:399
-#: src/msgmerge.c:555 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:860
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1163,15 +1170,15 @@ msgstr ""
 "                              ÛÉÒÉÎÙ ×ÙÈÏÄÎÏÊ ÓÔÒÁÎÉÃÙ\n"
 
 #: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:558 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:863
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n"
 
 #: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:560 src/msguniq.c:395
-#: src/xgettext.c:865
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n"
@@ -1181,7 +1188,7 @@ msgstr "  -F, --sort-by-file          
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ÚÁÄÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ËÒÉÔÅÒÉÊ ×ÙÂÏÒÁ (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:734
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [÷èïäîïê-æáêì]...\n"
@@ -1210,19 +1217,19 @@ msgstr ""
 "ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ.  ëÏÍÍÅÎÔÁÒÉÉ, ÓÏÄÅÒÖÁÝÉÅ ÉÍÑ ÆÁÊÌÁ É ÎÏÍÅÒ ÓÔÒÏËÉ\n"
 "ÓÏÈÒÁÎÑÀÔÓÑ ÄÌÑ ×ÓÅÈ PO-ÆÁÊÌÏ×.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:750
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ÷èïäîïê-æáêì...             ×ÈÏÄÎÙÅ ÆÁÊÌÙ\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:752
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=æáêì       ÐÏÌÕÞÉÔØ ÓÐÉÓÏË ×ÈÏÄÎÙÈ ÆÁÊÌÏ× ÉÚ æáêìá\n"
 
 #: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:756
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n"
@@ -1259,7 +1266,7 @@ msgstr ""
 "                              ÐÅÞÁÔØ ÔÏÌØËÏ ÕÎÉËÁÌØÎÙÈ ÓÏÏÂÝÅÎÉÊ\n"
 
 #: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:527
+#: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1268,7 +1275,7 @@ msgstr ""
 "properties\n"
 
 #: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:529
+#: src/msgmerge.c:532
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1308,21 +1315,21 @@ msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:325
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "ðÉÔÅÒ íÉÌÌÅÒ"
 
-#: src/msgcmp.c:178 src/msgmerge.c:336
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "ÎÅ ÚÁÄÁÎÙ ×ÈÏÄÎÙÅ ÆÁÊÌÙ"
 
-#: src/msgcmp.c:183 src/msgmerge.c:341
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ Ä×Á ×ÈÏÄÎÙÈ ÆÁÊÌÁ"
 
-#: src/msgcmp.c:202 src/msgmerge.c:450
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] def.po ref.pot\n"
@@ -1355,12 +1362,12 @@ msgstr "  def.po                      
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     ÓÓÙÌËÉ ÎÁ ÉÓÈÏÄÎÉËÉ\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:516
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "íÏÄÉÆÉËÁÔÏÒÙ ÒÅÖÉÍÁ ÒÁÂÏÔÙ:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:518
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1388,17 +1395,17 @@ msgstr "
 msgid "this message needs to be reviewed by the translator"
 msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÄÏÌÖÎÏ ÂÙÔØ ÐÒÏ×ÅÒÅÎÏ ÐÅÒÅ×ÏÄÞÉËÏÍ"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1220
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÏÇÒÁÍÍÏÊ, ÎÏ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1223
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ÏÄÎÁËÏ ÚÄÅÓØ ÏÐÒÅÄÅÌÅÎÏ ÐÏÈÏÖÅÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1251
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
@@ -1452,7 +1459,7 @@ msgstr ""
 "ÕÍÏÌÞÁÎÉÀ\n"
 "                              ÂÏÌØÛÅ ÏÄÎÏÇÏ)\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:867
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1474,19 +1481,19 @@ msgstr "
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ËÏÄÉÒÏ×ËÁ ÔÅËÕÝÅÊ ÌÏËÁÌÉ.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:541
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                ÉÓÐÏÌØÚÏ×ÁÔØ ÎÁ ×Ù×ÏÄÅ ÏÔÓÔÕÐÙ\n"
 
 #: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:543
+#: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           ÕÂÒÁÔØ ÓÔÒÏËÉ '#: ÆÁÊÌ:ÓÔÒÏËÁ'\n"
 
 #: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:545
+#: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1495,14 +1502,14 @@ msgstr ""
 "ÕÍÏÌÞÁÎÉÀ)\n"
 
 #: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:547
+#: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                ×Ù×ÏÄÉÔØ × ÓÔÒÏÇÏÍ ÓÏÏÔ×ÅÔÓÔ×ÉÉ ÓÔÁÎÄÁÒÔÕ "
 "Uniforum\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:552
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "ÎÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ"
@@ -1690,18 +1697,18 @@ msgstr "
 msgid "%s subprocess terminated with exit code %d"
 msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ %d"
 
-#: src/msgfmt.c:303
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ ÏÄÉÎÏÞÎÙÍ ÐÕÎËÔÕÁÃÉÏÎÎÙÍ ÚÎÁËÏÍ"
 
-#: src/msgfmt.c:350
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:514
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr "õÌØÒÉÈ äÒÅÐÐÅÒ"
 
@@ -1760,7 +1767,7 @@ msgstr "
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "óÏÚÄÁÅÔ Ä×ÏÉÞÎÙÊ ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÉÚ ÔÅËÓÔÏ×ÏÇÏ ÏÐÉÓÁÎÉÑ ÐÅÒÅ×ÏÄÏ×.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:743
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1774,7 +1781,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  ÉÍÑ-ÆÁÊÌ.po ...             ×ÈÏÄÎÙÅ ÆÁÊÌÙ\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:482 src/msgunfmt.c:426 src/xgettext.c:791
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "òÅÖÉÍ ÒÁÂÏÔÙ:\n"
@@ -1828,7 +1835,7 @@ msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                ÓÔÒÏÇÏ ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ÓÔÁÎÄÁÒÔÕ Uniforum\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:767
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1916,7 +1923,7 @@ msgstr ""
 "ëÌÀÞÉ -l É -d ÏÂÑÚÁÔÅÌØÎÙ.  ÷ÙÈÏÄÎÏÊ .msg-ÆÁÊÌ ÚÁÐÉÓÙ×ÁÅÔÓÑ × ÕËÁÚÁÎÎÙÊ "
 "ËÁÔÁÌÏÇ.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:783
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "éÎÔÅÒÐÒÅÔÁÃÉÑ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ:\n"
@@ -2003,7 +2010,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            ÎÁÐÅÞÁÔÁÔØ ÓÔÁÔÉÓÔÉËÕ Ï ÐÅÒÅ×ÏÄÁÈ\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:569 src/msgunfmt.c:515
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
@@ -2062,13 +2069,13 @@ msgstr "
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÓÈÏÄÎÙÊ ÆÁÊÌ ÓÏÄÅÒÖÉÔ ÎÅÔÏÞÎÙÅ ÐÅÒÅ×ÏÄÙ"
 
-#: src/msggrep.c:256 src/po-lex.c:658 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:141
-#: src/x-c.c:416 src/x-csharp.c:160 src/x-elisp.c:147 src/x-glade.c:452
-#: src/x-java.c:173 src/x-librep.c:149 src/x-lisp.c:214 src/x-perl.c:228
-#: src/x-perl.c:303 src/x-perl.c:396 src/x-php.c:164 src/x-python.c:176
-#: src/x-rst.c:235 src/x-scheme.c:173 src/x-sh.c:157 src/x-smalltalk.c:93
-#: src/x-tcl.c:152 src/x-ycp.c:93
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ \"%s\""
@@ -2196,7 +2203,7 @@ msgstr "      --sort-output           
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n"
 
-#: src/msginit.c:286
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2206,7 +2213,7 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ ÓÒÅÄÙ LANG ËÁË ÏÐÉÓÁÎÏ × ÆÁÊÌÅ ABOUT-NLS.  üÔÏ\n"
 "ÎÅÏÂÈÏÄÉÍÏ, ÞÔÏÂÙ ×Ù ÍÏÇÌÉ ÐÒÏ×ÅÒÉÔØ Ó×ÏÉ ÐÅÒÅ×ÏÄÙ.\n"
 
-#: src/msginit.c:310
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2217,12 +2224,12 @@ msgstr ""
 "ðÏÖÁÊÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ÌÏËÁÌØ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --locale ÉÌÉ ×ÙÈÏÄÎÏÊ\n"
 "po-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --output-file.\n"
 
-#: src/msginit.c:336
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "óÏÚÄÁÎÏ %s.\n"
 
-#: src/msginit.c:356
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2231,12 +2238,12 @@ msgstr ""
 "óÏÚÄÁÅÔ ÎÏ×ÙÊ PO-ÆÁÊÌ, ÉÎÉÃÉÁÌÉÚÉÒÕÑ ÍÅÔÁÉÎÆÏÒÍÁÃÉÀ ÉÓÈÏÄÑ ÉÚ\n"
 "ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÓÒÅÄÙ.\n"
 
-#: src/msginit.c:366
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=÷èïäîïê-æáêì    ×ÈÏÄÎÏÊ POT-ÆÁÊÌ\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2246,12 +2253,12 @@ msgstr ""
 "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ, ÏÎ ÉÝÅÔÓÑ × ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ.\n"
 "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n"
 
-#: src/msginit.c:374
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=æáêì      ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × ÕËÁÚÁÎÎÙÊ ÆÁÊÌ\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2261,12 +2268,12 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ÌÏËÁÌÉ.  åÓÌÉ ÏÎ ÚÁÄÁÎ ËÁË -, ÒÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ\n"
 "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n"
 
-#: src/msginit.c:389
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=ññ_óó          ÚÁÄÁÅÔ ÃÅÌÅ×ÕÀ ÌÏËÁÌØ\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2274,7 +2281,7 @@ msgstr ""
 "      --no-translator         ÐÒÅÄÐÏÌÁÇÁÔØ, ÞÔÏ PO-ÆÁÊÌ ÓÇÅÎÅÒÉÒÏ×ÁÎ "
 "Á×ÔÏÍÁÔÉÞÅÓËÉ\n"
 
-#: src/msginit.c:451
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2282,12 +2289,12 @@ msgstr ""
 "îÁÊÄÅÎÏ ÂÏÌÅÅ ÏÄÎÏÇÏ pot-ÆÁÊÌÁ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÏÊ pot-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --input.\n"
 
-#: src/msginit.c:459 src/msginit.c:464
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÔÅËÕÝÅÇÏ ËÁÔÁÌÏÇÁ"
 
-#: src/msginit.c:472
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2295,14 +2302,14 @@ msgstr ""
 "÷ ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ ÎÅ ÎÁÊÄÅÎ pot-ÆÁÊÌ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÏÊ pot-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --input.\n"
 
-#: src/msginit.c:861 src/msginit.c:929 src/msginit.c:1089 src/msginit.c:1168
-#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
-#: src/read-tcl.c:127 src/write-resources.c:104
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ %d"
 
-#: src/msginit.c:1054
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2318,28 +2325,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1443
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "áÎÇÌÉÊÓËÉÅ ÐÅÒÅ×ÏÄÙ ÄÌÑ ÐÁËÅÔÁ %s"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "ÔÅËÕÝÁÑ ËÏÄÉÒÏ×ËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÉÍÅÎÅÍ ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "×Ï ×ÈÏÄÎÏÍ ÆÁÊÌÅ Ä×Å ÒÁÚÎÙÅ ËÏÄÉÒÏ×ËÉ \"%s\" É \"%s\""
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "×ÈÏÄÎÏÊ ÆÁÊÌ `%s' ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-cat.c:207
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2348,19 +2355,19 @@ msgstr ""
 "ÄÏÍÅÎ \"%s\" ×Ï ×ÈÏÄÎÏÍ ÆÁÊÌÅ `%s' ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ "
 "ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-cat.c:389 src/msgl-iconv.c:361
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "ÃÅÌÅ×ÁÑ ËÏÄÉÒÏ×ËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÉÍÅÎÅÍ ËÏÄÉÒÏ×ËÉ."
 
-#: src/msgl-cat.c:440 src/msgl-cat.c:446 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:2770
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: src/msgl-cat.c:441
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2369,7 +2376,7 @@ msgstr ""
 "÷ÈÏÄÎÙÅ ÆÁÊÌÙ ÓÏÄÅÒÖÁÔ ÓÏÏÂÝÅÎÉÑ × ÒÁÚÎÙÈ ËÏÄÉÒÏ×ËÁÈ, × ÔÏÍ ÞÉÓÌÅ ×\n"
 "UTF-8.  ÷Ù×ÏÄ ÐÒÅÏÂÒÁÚÕÅÔÓÑ Ë UTF-8.\n"
 
-#: src/msgl-cat.c:447
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2382,7 +2389,7 @@ msgstr ""
 "÷Ù×ÏÄ ÐÒÅÏÂÒÁÚÕÅÔÓÑ Ë UTF-8.  þÔÏÂÙ ×ÙÂÒÁÔØ ÄÒÕÇÕÀ ×ÙÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ,\n"
 "ÉÓÐÏÌØÚÕÊÔÅ ËÌÀÞ --to-code.\n"
 
-#: src/msgl-cat.c:486
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2396,7 +2403,7 @@ msgstr ""
 "ÏÎÉ\n"
 "ÉÚÎÁÞÁÌØÎÏ ÐÒÅÄÓÔÁ×ÌÅÎÙ × UTF-8, ÎÁÐÒÉÍÅÒ × ÉÓÈÏÄÎÙÈ ÆÁÊÌÁÈ ÐÒÏÇÒÁÍÍÙ.\n"
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2408,12 +2415,12 @@ msgstr ""
 "÷Ù×ÏÄ '%s' ÍÏÖÅÔ ÂÙÔØ ÎÅÐÒÁ×ÉÌØÎÙÍ.\n"
 "÷ÏÚÍÏÖÎÙÅ ÍÅÔÏÄÙ ÏÂÏÊÔÉ ÜÔÕ ÓÉÔÕÁÃÉÀ:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- õÓÔÁÎÏ×ÉÔØ LC_ALL ÒÁ×ÎÏÊ ÌÏËÁÌÉ Ó ËÏÄÉÒÏ×ËÏÊ %s.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2424,7 +2431,7 @@ msgstr ""
 "  ÚÁÔÅÍ ÐÒÉÍÅÎÉÔØ '%s',\n"
 "  ÚÁÔÅÍ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÏÂÒÁÔÎÏ Ë %s Ó ÐÏÍÏÝØÀ 'msgconv'.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2437,7 +2444,7 @@ msgstr ""
 "  ÚÁÔÅÍ ÐÒÉÍÅÎÉÔØ '%s',\n"
 "  ÚÁÔÅÍ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÏÂÒÁÔÎÏ Ë %s Ó ÐÏÍÏÝØÀ 'msgconv'.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2448,26 +2455,26 @@ msgstr ""
 "÷Ù×ÏÄ '%s' ÍÏÖÅÔ ÂÙÔØ ÎÅÐÒÁ×ÉÌØÎÙÍ.\n"
 "÷ÏÚÍÏÖÎÙÊ ÍÅÔÏÄ ÏÂÏÊÔÉ ÜÔÕ ÓÉÔÕÁÃÉÀ -- ÕÓÔÁÎÏ×ÉÔØ LC_ALL=C.\n"
 
-#: src/msgl-check.c:91
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÏÔÒÉÃÁÔÅÌØÎÙÅ ÚÎÁÞÅÎÉÑ"
 
-#: src/msgl-check.c:101
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ÎÏ ×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÚÎÁÞÅÎÉÑ ÄÏ "
 "%lu"
 
-#: src/msgl-check.c:142
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÄÅÌÅÎÉÅ ÎÁ ÎÏÌØ"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁÔØ ÐÅÒÅÐÏÌÎÉÅ ÃÅÌÏÇÏ"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2475,53 +2482,53 @@ msgstr ""
 "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÉÓËÌÀÞÉÔÅÌØÎÙÅ ÓÉÔÕÁÃÉÉ × "
 "ÁÒÉÆÍÅÔÉËÅ, ×ÏÚÍÏÖÎÏ, ÄÅÌÅÎÉÅ ÎÁ ÎÏÌØ"
 
-#: src/msgl-check.c:184
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "ðÏÐÒÏÂÕÊÔÅ ÓÌÅÄÕÀÝÅÅ, ÐÏÄÈÏÄÉÔ ÄÌÑ %s:"
 
-#: src/msgl-check.c:267 src/msgl-check.c:291
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgl-check.c:269
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ÎÏ × ÚÁÇÏÌÏ×ËÅ ÎÅÔ ÁÔÒÉÂÕÔÁ \"plural=÷ùòáöåîéå\""
 
-#: src/msgl-check.c:293
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ÎÏ × ÚÁÇÏÌÏ×ËÅ ÎÅÔ ÁÔÒÉÂÕÔÁ \"nplurals=ãåìïå\""
 
-#: src/msgl-check.c:329
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "ÎÅ×ÅÒÎÁÑ ÚÎÁÞÅÎÉÅ nplurals"
 
-#: src/msgl-check.c:351
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgl-check.c:381 src/msgl-check.c:397
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:383
-#, c-format, fuzzy
+#: src/msgl-check.c:392
+#, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÔÏÌØËÏ ÏÄÎÁ ÆÏÒÍÁ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 msgstr[1] "ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÔÏÌØËÏ %lu ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 msgstr[2] "ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÔÏÌØËÏ %lu ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgl-check.c:399
-#, c-format, fuzzy
+#: src/msgl-check.c:408
+#, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÅÓÔØ ÏÄÎÁ ÆÏÒÍÁ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 msgstr[1] "ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÅÓÔØ %lu ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 msgstr[2] "ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÅÓÔØ %lu ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgl-check.c:419
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2529,93 +2536,93 @@ msgstr ""
 "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ, ÎÏ × ÎÅÍ "
 "ÚÁÇÏÌÏ×ËÁ Ó \"Plural-Forms: nplurals=ãåìïå; plural=÷ùòáöåîéå;\""
 
-#: src/msgl-check.c:501
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgid_plural' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË "
 "ÄÒÕÇÏÅ -- ÎÅÔ"
 
-#: src/msgl-check.c:509
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr[%u]' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
 "-- ÎÅÔ"
 
-#: src/msgl-check.c:524
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ -- "
 "ÎÅÔ"
 
-#: src/msgl-check.c:542
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgid_plural' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
 "-- ÎÅÔ"
 
-#: src/msgl-check.c:550
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr[%u]' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
 "-- ÎÅÔ"
 
-#: src/msgl-check.c:565
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ -- ÎÅÔ"
 
-#: src/msgl-check.c:577
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "ÏÂÒÁÂÏÔËÁ ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ Ñ×ÌÑÅÔÓÑ ÒÁÓÛÉÒÅÎÉÅÍ GNU gettext"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "× msgstr ÎÅÄÏÓÔÁÅÔ ÏÔÍÅÔËÉ ËÌÁ×ÉÁÔÕÒÎÏÇÏ ÜË×É×ÁÌÅÎÔÁ '%c'"
 
-#: src/msgl-check.c:629
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "× msgstr ÓÌÉÛËÏÍ ÍÎÏÇÏ ÏÔÍÅÔÏË ËÌÁ×ÉÁÔÕÒÎÙÈ ÜË×É×ÁÌÅÎÔÏ× '%c'"
 
-#: src/msgl-check.c:669
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "× ÚÁÇÏÌÏ×ËÅ ÐÒÏÐÕÝÅÎÏ ÐÏÌÅ `%s'\n"
 
-#: src/msgl-check.c:677
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ `%s' ÄÏÌÖÎÏ ÎÁÞÉÎÁÔØÓÑ Ó ÎÏ×ÏÊ ÓÔÒÏËÉ\n"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "ÎÅËÏÔÏÒÙÅ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ ×ÓÅ ÅÝÅ ÉÍÅÀÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ\n"
 
-#: src/msgl-check.c:704
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ `%s' ×ÓÅ ÅÝÅ ÉÍÅÅÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ ×ÈÏÄ ÄÌÑ ËÏÄÉÒÏ×ËÉ \"%s\""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: ÏÛÉÂËÁ ÐÒÉ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÉ ÉÚ ËÏÄÉÒÏ×ËÉ \"%s\" × ËÏÄÉÒÏ×ËÕ \"%s\""
 
-#: src/msgl-iconv.c:269
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-iconv.c:291 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:618 src/xgettext.c:610
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2624,7 +2631,7 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÉÚ \"%s\" × \"%s\".  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(), ÎÏ "
 "iconv() ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÜÔÏ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ."
 
-#: src/msgl-iconv.c:321
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2633,8 +2640,8 @@ msgstr ""
 "ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÉÚ \"%s\" × \"%s\" ÐÏÒÏÖÄÁÅÔ ÄÕÂÌÉËÁÔÙ: ÎÅËÏÔÏÒÙÅ "
 "ÒÁÚÌÉÞÁÀÝÉÅÓÑ ÏÒÉÇÉÎÁÌÙ ÓÏÏÂÝÅÎÉÊ ÓÔÁÎÏ×ÑÔÓÑ ÏÄÉÎÁËÏ×ÙÍÉ."
 
-#: src/msgl-iconv.c:327 src/recode-sr-latin.c:301 src/x-python.c:625
-#: src/xgettext.c:617
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2643,16 +2650,16 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÉÚ \"%s\" × \"%s\".  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv().  üÔÁ "
 "×ÅÒÓÉÑ ÂÙÌÁ ÓÏÂÒÁÎÁ ÂÅÚ iconv()."
 
-#: src/msgmerge.c:358 src/msgmerge.c:364
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s ÄÏÐÕÓÔÉÍÏ ÔÏÌØËÏ Ó %s"
 
-#: src/msgmerge.c:418
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr "ÔÉÐ ÒÅÚÅÒ×ÎÏÇÏ ËÏÐÉÒÏ×ÁÎÉÑ"
 
-#: src/msgmerge.c:455
+#: src/msgmerge.c:458
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2677,18 +2684,18 @@ msgstr ""
 "ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÉÂÌÉÚÉÔÅÌØÎÏÅ ÓÒÁ×ÎÅÎÉÅ, ÅÓÌÉ ÎÅÌØÚÑ ÎÁÊÔÉ ÔÏÞÎÏÅ\n"
 "ÓÏ×ÐÁÄÅÎÉÅ.\n"
 
-#: src/msgmerge.c:472
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      ÐÅÒÅ×ÏÄÙ, ÓÓÙÌÁÀÝÉÅÓÑ ÎÁ ÓÔÁÒÙÅ ÉÓÈÏÄÎÉËÉ\n"
 
-#: src/msgmerge.c:474
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     ÓÓÙÌËÉ ÎÁ ÎÏ×ÙÅ ÉÓÈÏÄÎÉËÉ\n"
 
-#: src/msgmerge.c:478
+#: src/msgmerge.c:481
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2698,7 +2705,7 @@ msgstr ""
 "ÓÏÏÂÝÅÎÉÊ, \n"
 "                              ÍÏÖÎÏ ÕËÁÚÙ×ÁÔØ ÎÅÓËÏÌØËÏ ÒÁÚ\n"
 
-#: src/msgmerge.c:484
+#: src/msgmerge.c:487
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2707,28 +2714,28 @@ msgstr ""
 "  -U, --update                ÏÂÎÏ×ÉÔØ def.po,\n"
 "                              ÎÉÞÅÇÏ ÎÅ ÄÅÌÁÔØ, ÅÓÌÉ def.po ÕÖÅ ÏÂÎÏ×ÌÅÎ\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ × ÒÅÖÉÍÅ ÏÂÎÏ×ÌÅÎÉÑ:\n"
 
-#: src/msgmerge.c:498
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "òÅÚÕÌØÔÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ ÏÂÒÁÔÎÏ × def.po.\n"
 
-#: src/msgmerge.c:500
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=íåôïä          ÓÄÅÌÁÔØ ÒÅÚÅÒ×ÎÕÀ ËÏÐÉÀ def.po\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=óõææéëó        ÐÅÒÅËÒÙÔØ ÏÂÙÞÎÙÊ ÓÕÆÆÉËÓ ÒÅÚÅÒ×ÎÏÊ ËÏÐÉÉ\n"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:507
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2747,7 +2754,7 @@ msgstr ""
 "  simple, never   ×ÓÅÇÄÁ ÄÅÌÁÔØ ÐÒÏÓÔÙÅ ÒÅÚÅÒ×ÎÙÅ ËÏÐÉÉ\n"
 "\n"
 
-#: src/msgmerge.c:511
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2758,12 +2765,12 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÌÅÎ ÉÎÏÊ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --suffix ÉÌÉ ÐÅÒÅÍÅÎÎÏÊ ÓÒÅÄÙ\n"
 "SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:523
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     ÎÅ ÐÒÉÍÅÎÑÔØ ÎÅÞÅÔËÏÅ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:525
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2771,22 +2778,22 @@ msgstr ""
 "      --previous              ÓÏÈÒÁÎÉÔØ ÐÒÅÄÙÄÕÝÉÅ msgid ÐÅÒÅ×ÅÄÅÎÎÙÈ "
 "ÓÏÏÂÝÅÎÉÊ\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       ÎÅ ×Ù×ÏÄÉÔØ ÉÎÄÉËÁÔÏÒ ÐÒÏÇÒÅÓÓÁ\n"
 
-#: src/msgmerge.c:1324
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ÄÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ ÄÏÌÖÎÏ ÏÐÒÅÄÅÌÑÔØ ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgmerge.c:1347
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "ÄÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅ ÄÏÌÖÎÏ ÏÐÒÅÄÅÌÑÔØ ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgmerge.c:1685
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2795,7 +2802,7 @@ msgstr ""
 "%sðÒÏÞÉÔÁÎÏ ÓÏÏÂÝÅÎÉÊ: ÓÔÁÒÙÈ %ld + ÎÏ×ÙÈ %ld; ÏÂßÅÄÉÎÅÎÏ %ld, ÐÏÍÅÞÅÎÏ "
 "ÎÅÔÏÞÎÙÍÉ %ld, ÎÅÄÏÓÔÁÀÝÉÈ %ld, ÎÅÄÅÊÓÔ×ÉÔÅÌØÎÙÈ %ld.\n"
 
-#: src/msgmerge.c:1693
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " ÚÁ×ÅÒÛÅÎÏ.\n"
 
@@ -2940,12 +2947,12 @@ msgstr ""
 "  -u, --unique                ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÕÎÉËÁÌØÎÙÅ, ÐÒÏÐÕÓËÁÑ "
 "ÄÕÂÌÉËÁÔÙ\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr "<ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ>"
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2954,7 +2961,7 @@ msgstr ""
 "\"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÎÁÚ×ÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ.\n"
 "ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ Ë ËÏÄÉÒÏ×ËÅ ÐÏÌØÚÏ×ÁÔÅÌÑ ÍÏÖÅÔ ÎÅ ÓÒÁÂÏÔÁÔØ.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2963,7 +2970,7 @@ msgstr ""
 "ëÏÄÉÒÏËÁ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(), ÎÏ iconv() ÎÅ "
 "ÐÏÄÄÅÒÖÉ×ÁÅÔ \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2971,15 +2978,15 @@ msgstr ""
 "þÔÏÂÙ ÒÅÛÉÔØ ÜÔÕ ÐÒÏÂÌÅÍÕ, ÕÓÔÁÎÏ×ÉÔÅ GNU libiconv É ÐÅÒÅÕÓÔÁÎÏ×ÉÔÅ GNU "
 "gettext.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "÷ÙÐÏÌÎÅÎÉÅ ÐÒÏÄÏÌÖÁÅÔÓÑ, ÂÕÄÕÔ ÏÛÉÂËÉ ÒÁÚÂÏÒÁ."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "÷ÙÐÏÌÎÅÎÉÅ ÐÒÏÄÏÌÖÁÅÔÓÑ."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2988,7 +2995,7 @@ msgstr ""
 "ëÏÄÉÒÏËÁ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv().\n"
 "üÔÁ ×ÅÒÓÉÑ ÓÏÂÒÁÎÁ ÂÅÚ iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2996,32 +3003,32 @@ msgstr ""
 "÷ ÚÁÇÏÌÏ×ËÅ ÎÅ ÕËÁÚÁÎÁ ËÏÄÉÒÏ×ËÁ.\n"
 "ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ Ë ËÏÄÉÒÏ×ËÅ ÐÏÌØÚÏ×ÁÔÅÌÑ ÎÅ ÓÒÁÂÏÔÁÅÔ.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "ÎÅÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÅ ÐÒÉÍÅÎÅÎÉÅ #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "ÐÒÏÐÕÝÅÎÁ ÓÅËÃÉÑ `msgstr[]'"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "ÐÒÏÐÕÝÅÎÁ ÓÅËÃÉÑ `msgid_plural'"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "ÐÒÏÐÕÝÅÎÁ ÓÅËÃÉÑ `msgstr'"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "ÐÅÒ×ÁÑ ÆÏÒÍÁ ÍÎÏÖÅÓÔ×ÅÎÎÏÇÏ ÞÉÓÌÁ ÉÍÅÅÔ ÎÅÎÕÌÅ×ÏÊ ÉÎÄÅËÓ"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "ÆÏÒÍÁ ÍÎÏÖÅÓÔ×ÅÎÎÏÇÏ ÞÉÓÌÁ ÉÍÅÅÔ ÎÅÐÒÁ×ÉÌØÎÙÊ ÉÎÄÅËÓ"
@@ -3031,7 +3038,7 @@ msgstr "
 msgid "too many errors, aborting"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË, ÚÁ×ÅÒÛÅÎÉÅ"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:708 src/write-po.c:833
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ÎÅ×ÅÒÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
@@ -3076,60 +3083,60 @@ msgid "context separator  within string"
 msgstr "ÒÁÚÄÅÌÉÔÅÌØ ËÏÎÔÅËÓÔÁ  ×ÎÕÔÒÉ ÓÔÒÏËÉ"
 
 # ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÐÏËÁ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ
-#: src/read-catalog.c:328 src/xgettext.c:903
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ÜÔÏÔ ÆÁÊÌ ÎÅ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÄÉÒÅËÔÉ×Ù ÄÏÍÅÎÁ"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÏÏÂÝÅÎÉÑ"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "ÍÅÓÔÏ ÐÏÑ×ÌÅÎÉÑ ÐÅÒ×ÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ"
 
-#: src/read-mo.c:106 src/read-mo.c:127 src/read-mo.c:173 src/read-mo.c:200
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "ÆÁÊÌ \"%s\" ÕÓÅÞÅÎ"
 
-#: src/read-mo.c:130
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "ÆÁÊÌ \"%s\" ÓÏÄÅÒÖÉÔ ÓÔÒÏËÕ, ÎÅ ÚÁ×ÅÒÛÅÎÎÕÀ ÎÕÌÅÍ"
 
-#: src/read-mo.c:166 src/read-mo.c:275
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "ÆÁÊÌ \"%s\" ÎÅ × ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÆÏÒÍÁÔÕ GNU .mo"
 
-#: src/read-mo.c:179
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "ÆÁÊÌ \"%s\" ÓÏÄÅÒÖÉÔ ÓÔÒÏËÕ, ÎÅ ÚÁ×ÅÒÛÅÎÎÕÀ ÎÕÌÅÍ, × ÐÏÚÉÃÉÉ %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÅÒÎÙÊ ÓÉÎÔÁËÓÉÓ \\uxxxx ÄÌÑ ÚÎÁËÁ Unicode"
 
-#: src/read-stringtable.c:803
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÐÁÒÁ ËÌÀÞ/ÚÎÁÞÅÎÉÅ"
 
-#: src/read-stringtable.c:940
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ, ÐÏÓÌÅ ÓÔÒÏËÉ ÏÖÉÄÁÅÔÓÑ ';'"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
 "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ, ÐÏÓÌÅ ÓÔÒÏËÉ ÏÖÉÄÁÅÔÓÑ '=' ÉÌÉ ';'"
@@ -3195,7 +3202,7 @@ msgstr ""
 msgid "error writing stdout"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
 
-#: src/write-catalog.c:127
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
@@ -3203,7 +3210,7 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ×Ù×ÅÓÔÉ ÎÅÓËÏÌØËÏ ÄÏÍÅÎÏ× ÐÅÒÅ×ÏÄÁ × ÅÄÉÎÙÊ ÆÁÊÌ ÕËÁÚÁÎÎÏÇÏ "
 "ÆÏÒÍÁÔÁ.  ðÏÐÒÏÂÕÊÔÅ ÐÒÉÍÅÎÉÔØ ÓÉÎÔÁËÓÉÓ PO-ÆÁÊÌÏ×."
 
-#: src/write-catalog.c:130
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
@@ -3211,7 +3218,7 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ×Ù×ÅÓÔÉ ÎÅÓËÏÌØËÏ ÄÏÍÅÎÏ× ÐÅÒÅ×ÏÄÁ × ÅÄÉÎÙÊ ÆÁÊÌ ÕËÁÚÁÎÎÏÇÏ "
 "ÆÏÒÍÁÔÁ."
 
-#: src/write-catalog.c:163
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
@@ -3219,7 +3226,7 @@ msgstr ""
 "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ Ó ËÏÎÔÅËÓÔÏÍ, ÎÏ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ ÉÈ ÎÅ "
 "ÐÏÄÄÅÒÖÉ×ÁÅÔ."
 
-#: src/write-catalog.c:198
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3229,7 +3236,7 @@ msgstr ""
 "ÆÏÒÍÁÔ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÉÈ.  ðÏÐÒÏÂÕÊÔÅ ÓÇÅÎÅÒÉÒÏ×ÁÔØ Java-ËÌÁÓÓ Ó ÐÏÍÏÝØÀ "
 "\"msgfmt --java\", Á ÎÅ ÆÁÊÌ properties."
 
-#: src/write-catalog.c:203
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3237,66 +3244,62 @@ msgstr ""
 "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ, ÎÏ ×ÙÈÏÄÎÏÊ "
 "ÆÏÒÍÁÔ ÉÈ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ."
 
-#: src/write-catalog.c:230 src/write-catalog.c:274
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ \"%s\""
 
-#: src/write-catalog.c:238 src/write-catalog.c:282
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
 
-#: src/write-csharp.c:611
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ Ó ËÏÎÔÅËÓÔÏÍ, ÎÏ ÆÏÒÍÁÔ\n"
-".dll C# ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ËÏÎÔÅËÓÔÙ\n"
-
-#: src/write-csharp.c:678
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ \"%s\""
 
-#: src/write-csharp.c:740
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "ËÏÍÐÉÌÑÃÉÑ C#-ËÌÁÓÓÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ, ÐÏÐÒÏÂÕÊÔÅ --verbose"
 
-#: src/write-java.c:912
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ Ó ËÏÎÔÅËÓÔÏÍ, ÎÏ ÆÏÒÍÁÔ\n"
-"Java ResourceBundle ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ËÏÎÔÅËÓÔÙ\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "ËÏÍÐÉÌÑÃÉÑ C#-ËÌÁÓÓÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ, ÐÏÐÒÏÂÕÊÔÅ --verbose"
 
-#: src/write-java.c:937
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ÉÍÅÎÅÍ ËÌÁÓÓÁ Java"
 
-#: src/write-java.c:1021
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "ËÏÍÐÉÌÑÃÉÑ Java-ËÌÁÓÓÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ, ÐÏÐÒÏÂÕÊÔÅ --verbose ÉÌÉ "
 "ÕÓÔÁÎÏ×ÉÔÅ $JAVAC"
 
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"ËÏÍÐÉÌÑÃÉÑ Java-ËÌÁÓÓÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ, ÐÏÐÒÏÂÕÊÔÅ --verbose ÉÌÉ "
+"ÕÓÔÁÎÏ×ÉÔÅ $JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÚÁÐÉÓÉ"
 
-#: src/write-po.c:767
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "ðÅÒÅ×ÏÄÉÍÙÅ ÓÏÏÂÝÅÎÉÑ ÎÅ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ `\\%c'"
 
-#: src/write-po.c:1213 src/write-po.c:1342
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3309,7 +3312,7 @@ msgstr ""
 "ËÏÄÉÒÏ×ËÕ, ÞÔÏ É ×Ù.  ðÏÄÕÍÁÊÔÅ Ï ÉÓÐÏÌØÚÏ×ÁÎÉÉ × msgctxt ÞÉÓÔÏÊ ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1225 src/write-po.c:1354
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3322,7 +3325,7 @@ msgstr ""
 "ËÏÄÉÒÏ×ËÕ, ÞÔÏ É ×Ù.  ðÏÄÕÍÁÊÔÅ Ï ÉÓÐÏÌØÚÏ×ÁÎÉÉ × msgid ÞÉÓÔÏÊ ASCII.\n"
 "%s\n"
 
-#: src/write-qt.c:668
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3331,7 +3334,7 @@ msgstr ""
 "ËÁÔÁÌÏÇÏ× ÓÏÏÂÝÅÎÉÊ Qt ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÏÂÒÁÂÏÔËÕ ÍÎÏÖÅÓÔ×ÅÎÎÏÇÏ\n"
 "ÞÉÓÌÁ\n"
 
-#: src/write-qt.c:694
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3342,7 +3345,7 @@ msgstr ""
 "ÎÏ ÆÏÒÍÁÔ ËÁÔÁÌÏÇÁ ÓÏÏÂÝÅÎÉÊ Qt ÐÏÄÄÅÒÖÉ×ÁÅÔ Unicode ÔÏÌØËÏ ×\n"
 "ÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÔÒÏËÁÈ, ÎÏ ÎÅ × ËÏÎÔÅËÓÔÁÈ\n"
 
-#: src/write-qt.c:718
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3352,12 +3355,12 @@ msgstr ""
 "ÎÏ ÆÏÒÍÁÔ ËÁÔÁÌÏÇÁ ÓÏÏÂÝÅÎÉÊ Qt ÐÏÄÄÅÒÖÉ×ÁÅÔ Unicode ÔÏÌØËÏ ×\n"
 "ÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÔÒÏËÁÈ, ÎÏ ÎÅ × ÏÒÉÇÉÎÁÌÁÈ\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÚÁÐÉÓÉ ÄÏÞÅÒÎÅÍÕ ÐÒÏÃÅÓÓÕ \"%s\""
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3365,7 +3368,7 @@ msgstr ""
 "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ Ó ËÏÎÔÅËÓÔÏÍ, ÎÏ ÆÏÒÍÁÔ\n"
 ".resources C# ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ËÏÎÔÅËÓÔÙ\n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3373,7 +3376,7 @@ msgstr ""
 "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ, ÎÏ ÆÏÒÍÁÔ\n"
 ".resources C# ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÏÂÒÁÂÏÔËÕ ÍÎÏÖÅÓÔ×ÅÎÎÏÇÏ ÞÉÓÌÁ\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3381,7 +3384,7 @@ msgstr ""
 "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ Ó ËÏÎÔÅËÓÔÏÍ, ÎÏ ÆÏÒÍÁÔ\n"
 "ËÁÔÁÌÏÇÏ× ÓÏÏÂÝÅÎÉÊ ÄÌÑ Tcl ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ËÏÎÔÅËÓÔÙ\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3390,27 +3393,27 @@ msgstr ""
 "ËÁÔÁÌÏÇÏ× ÓÏÏÂÝÅÎÉÊ ÄÌÑ Tcl ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÏÂÒÁÂÏÔËÕ ÍÎÏÖÅÓÔ×ÅÎÎÏÇÏ\n"
 "ÞÉÓÌÁ\n"
 
-#: src/x-awk.c:343 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ"
 
-#: src/x-awk.c:594
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ"
 
-#: src/x-c.c:1155 src/x-csharp.c:1502 src/x-java.c:860
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÉÍ×ÏÌØÎÁÑ ËÏÎÓÔÁÎÔÁ"
 
-#: src/x-c.c:1179
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ"
 
-#: src/x-csharp.c:217 src/xgettext.c:1845
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3419,7 +3422,7 @@ msgstr ""
 "îÅ-ASCII-ÓÔÒÏËÁ × %s%s.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:264
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3428,7 +3431,7 @@ msgstr ""
 "%s:%d: îÅ×ÅÒÎÁÑ ÍÕÌØÔÉÂÁÊÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:280
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3437,7 +3440,7 @@ msgstr ""
 "%s:%d: äÌÉÎÎÁÑ ÎÅÐÏÌÎÁÑ ÍÕÌØÔÉÂÁÊÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:292
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3446,7 +3449,7 @@ msgstr ""
 "%s:%d: îÅÐÏÌÎÁÑ ÍÕÌØÔÉÂÁÊÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ × ËÏÎÃÅ ÆÁÊÌÁ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:301
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3455,12 +3458,12 @@ msgstr ""
 "%s:%d: îÅÐÏÌÎÁÑ ÍÕÌØÔÉÂÁÊÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ × ËÏÎÃÅ ÓÔÒÏËÉ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:310 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: ×ÙÚÏ× iconv ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ"
 
-#: src/x-csharp.c:333
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3469,32 +3472,32 @@ msgstr ""
 "%s:%d: îÅ×ÅÒÎÁÑ ÍÕÌØÔÉÂÁÊÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:1383 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÅÒÎÙÊ Unicode-ÚÎÁË"
 
-#: src/x-csharp.c:1505 src/x-java.c:863
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÏ×ÁÑ ËÏÎÓÔÁÎÔÁ"
 
-#: src/x-csharp.c:2009 src/x-java.c:1357
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ×ÓÔÒÅÞÅÎÁ ')', ÇÄÅ ÏÖÉÄÁÅÔÓÑ '}'"
 
-#: src/x-csharp.c:2043 src/x-java.c:1391
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ×ÓÔÒÅÞÅÎÁ '}', ÇÄÅ ÏÖÉÄÁÅÔÓÑ ')'"
 
-#: src/x-glade.c:459 src/x-glade.c:466
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:493
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3503,48 +3506,48 @@ msgstr ""
 "ñÚÙË \"glade\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ expat.\n"
 "üÔÁ ×ÅÒÓÉÑ ÓÏÂÒÁÎÁ ÂÅÚ expat.\n"
 
-#: src/x-java.c:483
+#: src/x-java.c:492
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ"
 
-#: src/x-perl.c:309
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: ÎÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ ÏÇÒÁÎÉÞÉÔÅÌØ ÓÔÒÏËÉ \"%s\" ×ÐÌÏÔØ ÄÏ ËÏÎÃÁ ÆÁÊÌÁ"
 
-#: src/x-perl.c:1035
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: ÐÒÏÐÕÝÅÎÁ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ × \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1155
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: ÎÅ×ÅÒÎÁÑ ÉÎÔÅÒÐÏÌÑÃÉÑ (\"\\l\") ×ÏÓØÍÉÂÉÔÎÏÇÏ ÚÎÁËÁ \"%c\""
 
-#: src/x-perl.c:1175
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: ÎÅ×ÅÒÎÁÑ ÉÎÔÅÒÐÏÌÑÃÉÑ (\"\\u\") ×ÏÓØÍÉÂÉÔÎÏÇÏ ÚÎÁËÁ \"%c\""
 
-#: src/x-perl.c:1209
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: ÎÅ×ÅÒÎÁÑ ÉÎÔÅÒÐÏÌÑÃÉÑ ÐÅÒÅÍÅÎÎÏÊ × \"%c\""
 
-#: src/x-perl.c:1222
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: ÎÅ×ÅÒÎÁÑ ÉÎÔÅÒÐÏÌÑÃÉÑ (\"\\L\") ×ÏÓØÍÉÂÉÔÎÏÇÏ ÚÎÁËÁ \"%c\""
 
-#: src/x-perl.c:1239
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ÎÅ×ÅÒÎÁÑ ÉÎÔÅÒÐÏÌÑÃÉÑ (\"\\U\") ×ÏÓØÍÉÂÉÔÎÏÇÏ ÚÎÁËÁ \"%c\""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3556,7 +3559,7 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3568,7 +3571,7 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3580,7 +3583,7 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3592,7 +3595,7 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3604,7 +3607,7 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3616,27 +3619,27 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "ëÏÄÉÒÏ×ËÁ \"%s\" ÎÅÉÚ×ÅÓÔÎÁ.  ðÒÏÄÏÌÖÅÎÉÅ ÒÁÂÏÔÙ Ó ASCII."
 
-#: src/x-rst.c:110
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ÎÅ×ÅÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÔÒÏËÉ"
 
-#: src/x-rst.c:174
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: ÐÒÏÐÕÝÅÎÏ ÞÉÓÌÏ ÐÏÓÌÅ #"
 
-#: src/x-rst.c:209
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ÎÅ×ÅÒÎÏÅ ÓÔÒÏËÏ×ÏÅ ×ÙÒÁÖÅÎÉÅ"
 
-#: src/x-sh.c:1076
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3645,29 +3648,29 @@ msgstr ""
 "%s:%lu: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÉÎÔÁËÓÉÓ $\"...\" ÚÁÐÒÅÝÅÎ ÐÏ ÓÏÏÂÒÁÖÅÎÉÑÍ "
 "ÂÅÚÏÐÁÓÎÏÓÔÉ; ÉÓÐÏÌØÚÕÊÔÅ eval_gettext"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "ËÌÀÞ --join-existing ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÐÒÉ ÚÁÐÉÓÉ × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ÎÅ ÍÏÖÅÔ ÒÁÂÏÔÁÔØ, ÎÅ ÚÎÁÑ ÉÓËÏÍÙÈ ËÌÀÞÅ×ÙÈ ÓÌÏ×"
 
-#: src/xgettext.c:687
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÆÁÊÌ `%s' ÉÍÅÅÔ ÎÅÉÚ×ÅÓÔÎÏÅ ÒÁÓÛÉÒÅÎÉÅ `%s'; ÔÒÁËÔÕÅÔÓÑ ËÁË C"
 
-#: src/xgettext.c:738
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "éÚ×ÌÅËÁÅÔ ÐÅÒÅ×ÏÄÉÍÙÅ ÓÔÒÏËÉ ÉÚ ÕËÁÚÁÎÎÙÈ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×.\n"
 
-#: src/xgettext.c:761
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3675,23 +3678,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=éíñ    ×Ù×ÏÄÉÔØ × ÆÁÊÌ éíñ.po (×ÍÅÓÔÏ messages.po)\n"
 
-#: src/xgettext.c:763
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=æáêì           ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × ÕËÁÚÁÎÎÙÊ ÆÁÊÌ\n"
 
-#: src/xgettext.c:765
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=ëáô        ÐÏÍÅÓÔÉÔØ ×ÙÈÏÄÎÙÅ ÆÁÊÌÙ × ËÁÔÁÌÏÇ ëáô\n"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "÷ÙÂÏÒ ÑÚÙËÁ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ:\n"
 
-#: src/xgettext.c:772
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3710,19 +3713,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   ÓÉÎÏÎÉÍ --language=C++\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ ÑÚÙË ÏÐÒÅÄÅÌÑÅÔÓÑ ÐÏ ÒÁÓÛÉÒÅÎÉÀ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ.\n"
 
-#: src/xgettext.c:785
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3731,22 +3734,22 @@ msgstr ""
 "      --from-code=éíñ            ËÏÄÉÒÏ×ËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n"
 "                                   (ËÒÏÍÅ Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ ÓÞÉÔÁÅÔÓÑ, ÞÔÏ ×ÈÏÄÎÙÅ ÆÁÊÌÙ ÓÏÄÅÒÖÁÔ ÔÏÌØËÏ ASCII.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         ÓÌÉÔØ ÓÏÏÂÝÅÎÉÑ Ó ÓÕÝÅÓÔ×ÕÀÝÉÍ ÆÁÊÌÏÍ\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=æáêì.po  ÎÅ ÉÚ×ÌÅËÁÔØ ×ÈÏÖÄÅÎÉÑ ÉÚ æáêìá.po\n"
 
-#: src/xgettext.c:797
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3756,17 +3759,17 @@ msgstr ""
 "                              ôåçïí (ÉÌÉ Ó ËÏÍÍÅÎÔÁÒÉÑÍÉ, ÐÒÅÄÛÅÓÔ×ÕÀÝÉÍÉ\n"
 "                              ËÌÀÞÅ×ÏÊ ÓÔÒÏËÅ)\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "ëÌÀÞÉ ÄÌÑ ËÏÎËÒÅÔÎÙÈ ÑÚÙËÏ×:\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ÉÚ×ÌÅÞØ ×ÓÅ ÓÔÒÏËÉ\n"
 
-#: src/xgettext.c:805 src/xgettext.c:812
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3779,7 +3782,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3789,7 +3792,7 @@ msgstr ""
 "                              ÚÁÄÁÎÉÑ óìï÷á ÏÂÏÚÎÁÞÁÅÔ, ÞÔÏ ÎÅ ÎÕÖÎÏ \n"
 "                              ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞÅ×ÙÅ ÓÌÏ×Á ÐÏ ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3800,7 +3803,7 @@ msgstr ""
 "ÁÒÇÕÍÅÎÔÁ\n"
 "                              ÎÏÍÅÒ áòç ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á óìï÷ï\n"
 
-#: src/xgettext.c:819
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3813,32 +3816,37 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ÐÏÎÉÍÁÔØ ÎÁ ×ÈÏÄÅ ÔÒÉÇÒÁÆÙ ANSI C\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (ÔÏÌØËÏ ÑÚÙËÉ C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    ÒÁÓÐÏÚÎÁ×ÁÔØ ÆÏÒÍÁÔÎÙÅ ÓÔÒÏËÉ Qt\n"
 
-#: src/xgettext.c:829 src/xgettext.c:833
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (ÔÏÌØËÏ ÑÚÙË C++)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    ÒÁÓÐÏÚÎÁ×ÁÔØ ÆÏÒÍÁÔÎÙÅ ÓÔÒÏËÉ Qt\n"
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 ÒÁÓÐÏÚÎÁ×ÁÔØ ÆÏÒÍÁÔÎÙÅ ÓÔÒÏËÉ Boost\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3846,19 +3854,19 @@ msgstr ""
 "      --debug                 ÂÏÌÅÅ ÐÏÄÒÏÂÎÙÊ ÒÅÚÕÌØÔÁÔ ÒÁÚÂÏÒÁ ÆÏÒÍÁÔÎÏÊ "
 "ÓÔÒÏËÉ\n"
 
-#: src/xgettext.c:854
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     ÚÁÐÉÓÁÔØ .properties-ÆÁÊÌ Java\n"
 
-#: src/xgettext.c:869
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=óôòïëá\n"
 "                      ÚÁÄÁÅÔ ÎÁÉÍÅÎÏ×ÁÎÉÅ ÏÂÌÁÄÁÔÅÌÑ Á×ÔÏÒÓËÉÈ ÐÒÁ×\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3866,7 +3874,19 @@ msgstr ""
 "      --foreign-user          ÎÅ ×Ù×ÏÄÉÔØ Õ×ÅÄÏÍÌÅÎÉÅ Ï Á×ÔÏÒÓËÉÈ ÐÒÁ×ÁÈ "
 "FSF\n"
 
-#: src/xgettext.c:873
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+"      --copyright-holder=óôòïëá\n"
+"                      ÚÁÄÁÅÔ ÎÁÉÍÅÎÏ×ÁÎÉÅ ÏÂÌÁÄÁÔÅÌÑ Á×ÔÏÒÓËÉÈ ÐÒÁ×\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3875,7 +3895,7 @@ msgstr ""
 "                      ÚÁÄÁÅÔ ÁÄÒÅÓ, ËÕÄÁ ÓÌÅÄÕÅÔ ÏÔÐÒÁ×ÌÑÔØ ÏÔÞÅÔ Ï "
 "ÏÛÉÂËÁÈ\n"
 
-#: src/xgettext.c:875
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3885,7 +3905,7 @@ msgstr ""
 "                      ÉÓÐÏÌØÚÏ×ÁÔØ óôòïëõ ÉÌÉ \"\" ËÁË ÐÒÅÆÉËÓ Ë ×ÈÏÖÄÅÎÉÑÍ "
 "msgstr\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3895,7 +3915,7 @@ msgstr ""
 "                      ÉÓÐÏÌØÚÏ×ÁÔØ óôòïëõ ÉÌÉ \"\" ËÁË ÓÕÆÆÉËÓ Ë ×ÈÏÖÄÅÎÉÑÍ "
 "msgstr\n"
 
-#: src/xgettext.c:1642
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3904,16 +3924,16 @@ msgstr ""
 "áÒÇÕÍÅÎÔ --flag ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÓÉÎÔÁËÓÉÓÕ <ËÌÀÞÅ×ÏÅ-ÓÌÏ×Ï>:<ÎÏÍÅÒ-ÁÒÇ>:"
 "[pass-]<ÆÌÁÇ>: %s"
 
-#: src/xgettext.c:1741
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ"
 
-#: src/xgettext.c:1921 src/xgettext.c:1954 src/xgettext.c:2012
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: src/xgettext.c:1924
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3922,7 +3942,7 @@ msgstr ""
 "îÅÓÍÏÔÒÑ ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ × ÍÅÓÔÅ, ÇÄÅ ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ ÆÏÒÍÁÔÎÁÑ ÓÔÒÏËÁ, %s "
 "ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÏÊ ÆÏÒÍÁÔÎÏÊ ÓÔÒÏËÏÊ %s.  ðÒÉÞÉÎÁ: %s\n"
 
-#: src/xgettext.c:1925
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3931,7 +3951,7 @@ msgstr ""
 "óÔÒÏËÁ %s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÏÊ ÆÏÒÍÁÔÎÏÊ ÓÔÒÏËÏÊ %s, ÈÏÔÑ É ÏÂßÑ×ÌÅÎÁ ËÁË "
 "ÔÁËÏ×ÁÑ.  ðÒÉÞÉÎÁ: %s\n"
 
-#: src/xgettext.c:1956
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3945,7 +3965,7 @@ msgstr ""
 "ðÏÖÁÌÕÊÓÔÁ, ÉÓÐÏÌØÚÕÊÔÅ ÆÏÒÍÁÔÎÕÀ ÓÔÒÏËÕ Ó ÉÍÅÎÏ×ÁÎÎÙÍÉ ÁÒÇÕÍÅÎÔÁÍÉ É\n"
 "ÏÔÏÂÒÁÖÅÎÉÅ ×ÍÅÓÔÏ ËÏÒÔÅÖÁ ÄÌÑ ÁÒÇÕÍÅÎÔÏ×.\n"
 
-#: src/xgettext.c:2014
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3955,29 +3975,29 @@ msgstr ""
 "gettext(\"\") ×ÏÚ×ÒÁÝÁÅÔ ÔÅËÓÔ ÚÁÇÏÌÏ×ËÁ Ó ÍÅÔÁÉÎÆÏÒÍÁÃÉÅÊ,\n"
 "Á ÎÅ ÐÕÓÔÕÀ ÓÔÒÏËÕ.\n"
 
-#: src/xgettext.c:2618
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "ÎÅÏÄÎÏÚÎÁÞÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ÁÒÇÕÍÅÎÔÁ ÄÌÑ ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á '%.*s'"
 
-#: src/xgettext.c:2645
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÕËÁÚÁÎ ËÏÎÔÅËÓÔ ÄÌÑ ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á '%.*s'"
 
-#: src/xgettext.c:2670
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÕËÁÚÁÎ ËÏÎÔÅËÓÔ ÄÌÑ ÁÒÇÕÍÅÎÔÁ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ Õ "
 "ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á '%.*s'"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ËÏÎÔÅËÓÔÙ Õ ÆÏÒÍ × ÅÄÉÎÓÔ×ÅÎÎÏÍ É ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/xgettext.c:2771
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3988,7 +4008,7 @@ msgstr ""
 "`Makevars', ÕÓÔÁÎÏ×ÉÔÅ × ÎÅÍ ÐÅÒÅÍÅÎÎÕÀ MSGID_BUGS_ADDRESS, ×\n"
 "ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÚÁÄÁÊÔÅ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ ËÌÀÞ --msgid-bugs-address.\n"
 
-#: src/xgettext.c:2970
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "ÑÚÙË `%s' ÎÅÉÚ×ÅÓÔÅÎ"
@@ -3996,3 +4016,33 @@ msgstr "
 #: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr "<ÂÅÚ ÉÍÅÎÉ>"
+
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "íÎÏÖÅÓÔ×ÅÎÎÙÅ ÓÓÙÌËÉ ÎÁ %%%c."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "üÔÏ Ó×ÏÂÏÄÎÁÑ ÐÒÏÇÒÁÍÍÁ; ÐÏÄÒÏÂÎÏÓÔÉ Ï ÕÓÌÏ×ÉÑÈ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ "
+#~ "ÓÍÏÔÒÉÔÅ\n"
+#~ "× ÉÓÈÏÄÎÏÍ ÔÅËÓÔÅ.  íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ; ÄÁÖÅ ÇÁÒÁÎÔÉÊ\n"
+#~ "ëïííåòþåóëïê ãåîîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ Ó ËÏÎÔÅËÓÔÏÍ, ÎÏ ÆÏÒÍÁÔ\n"
+#~ ".dll C# ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ËÏÎÔÅËÓÔÙ\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ Ó ËÏÎÔÅËÓÔÏÍ, ÎÏ ÆÏÒÍÁÔ\n"
+#~ "Java ResourceBundle ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ËÏÎÔÅËÓÔÙ\n"
diff --git a/gettext-tools/po/sk.po b/gettext-tools/po/sk.po
index 83486c6f0..060dc5ed2 100644
--- a/gettext-tools/po/sk.po
+++ b/gettext-tools/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2005-05-23 22:16+0200\n"
 "Last-Translator: Marcel Telka \n"
 "Language-Team: Slovak \n"
@@ -16,87 +16,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "neplatný parameter %s pre %s"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "nejednoznačný parameter %s pre %s"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Platné parametre sú:"
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "nemôžem nájsť dočasný adresár, skúste nastaviť $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "nemôžem vytvoriť dočasný adresár so šablónou \"%s\""
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "nie je možné vytvoriť výstupný súbor \"%s\""
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "nemôžem vytvoriť dočasný adresár so šablónou \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "chyba zápisu"
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "chyba pri otváraní súboru \"%s\" na čítanie"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "nemôžem otvoriť súbor  \"%s\" na zápis"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "chyba pri čítaní \"%s\""
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "chyba pri zápise \"%s\""
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "chyba po čítaní \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() zlyhalo"
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Kompilátor C# nebol nájdený. Skúste nainštalovať pnet"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Virtuálny stroj C# nebol nájdený. Skúste nainštalovať pnet"
@@ -105,122 +106,122 @@ msgstr "Virtuálny stroj C# nebol nájdený. Skúste nainštalovať pnet"
 msgid "Unknown system error"
 msgstr "Neznáma systémová chyba"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s podproces zlyhal"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: voľba `%s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: voľba `--%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: voľba `%c%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: voľba `%s' vyžaduje parameter\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: neznáma voľba `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: neznáma voľba `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: neprípustná voľba -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: neplatná voľba -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: voľba vyžaduje parameter -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: voľba `-W %s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: voľba `-W %s' nedovoľuje použitie parametra\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "zlyhalo vytvorenie \"%s\""
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba počas zápisu do súboru \"%s\""
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Kompilátor Javy nebol nájdený. Skúste nainštalovať gcj alebo nastavte $JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtuálny stroj Javy nebol nájdený. Skúste nainštalovať gij alebo nastavte "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "V/V chyba podprocesu %s"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "pamäť je vyčerpaná"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "nemôžem vytvoriť rúru"
@@ -244,73 +245,73 @@ msgstr "nemôžem vytvoriť rúru"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandle zlyhal s chybovým kódom 0x%08x"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "zlyhalo _open_osfhandle"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s podproces"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s podproces dostal kritický signál %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 "'%s' nie je platný formátovací reťazec %s, na rozdiel od 'msgid'. Dôvod: %s"
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "formátovacia značka pre parameter %u v '%s' nie je v 'msgid'"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formátovacia značka pre parameter %u nie je v '%s'"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "formátovacie značky v 'msgid' a '%s' pre parameter %u nie sú rovnaké"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, fuzzy, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "Direktíva číslo %u končí neplatným znakom namiesto '}'."
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -319,102 +320,109 @@ msgstr ""
 "V direktíve číslo %u, token za '<' nie je názov makra špecifikujúceho "
 "formát. Platné názvy makier sú uvedené v ISO C 99 kapitola 7.8.1."
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "V direktíve číslo %u, token za '<' nie je nasledovaný znakom '>'."
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Reťazec sa odkazuje na parameter číslo %u, ale ignoruje parameter číslo %u."
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "počet formátovacích značiek v 'msgid' a '%s' sa nezhoduje"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "V direktíve číslo %u, '{' nie je nasledované číslom parametra."
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "V direktíve číslo %u, ',' nie je nasledované číslom."
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "Reťazec končí v strede direktívy: nájdené '{' bez zodpovedajúceho '}'."
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "Direktíva číslo %u končí neplatným znakom '%c' namiesto '}'."
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Direktíva číslo %u končí neplatným znakom namiesto '}'."
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 "Reťazec začína v strede direktívy: nájdené '}' bez zodpovedajúceho '{'."
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Reťazec obsahuje osamotené '}' po direktíve číslo %u."
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "V direktíve číslo %u, parameter %d je negatívny."
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "V direktíve číslo %u, príznaky nie sú povolené pred '%c'."
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "V direktíve číslo %u, parameter číslo 0 nie je kladné číslo."
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "V direktíve číslo %u, príznaky nie sú povolené pred '%c'."
+
+#: src/format-gcc-internal.c:404
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "V direktíve číslo %u, parameter %d je negatívny."
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "V direktíve číslo %u, príznaky nie sú povolené pred '%c'."
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "'msgid' používa %%m, ale '%s' nie"
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' nepoužíva %%m, ale '%s' používa %%m"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Reťazec končí v strede direktívy."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -422,34 +430,34 @@ msgstr ""
 "Reťazec sa odkazuje na parametre cez absolútne čísla parametrov aj cez "
 "nečíslované špecifikácie parametrov."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "V direktíve číslo %u, parameter číslo 0 nie je kladné číslo."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr "V direktíve číslo %u, parameter šírky číslo 0 nie je kladné číslo."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr "V direktíve číslo %u, parameter presnosti číslo 0 nie je kladné číslo."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr "V direktíve číslo %u, znak '%c' nie je platný špecifikátor konverzie."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -457,12 +465,12 @@ msgid ""
 msgstr ""
 "Znak, ktorý ukončuje direktívu číslo %u nie je platný špecifikátor konverzie."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Reťazec sa odkazuje na číslo parametra %u nekompatibilnými spôsobmi."
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -470,18 +478,18 @@ msgid ""
 msgstr ""
 "V direktíve číslo %u, podreťazec \"%s\" nie je platný typ dátumu a času."
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "V direktíve číslo %u, \"%s\" nie je nasledované čiarkou."
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "V direktíve číslo %u, podreťazec \"%s\" nie je platný typ čísla."
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -490,12 +498,12 @@ msgstr ""
 "V direktíve číslo %u, číslo parametra nie je nasledované čiarkou a jedným z "
 "\"%s\", \"%s\", \"%s\", \"%s\"."
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "V direktíve číslo %u, voľba neobsahuje číslo."
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -504,26 +512,26 @@ msgstr ""
 "V direktíve číslo %u, voľba obsahuje číslo, ktoré nie je nasledované '<', "
 "'#' alebo '%s'."
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "formátovacia značka pre parameter {%u} v '%s' nie je v 'msgid'"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "formátovacia značka pre parameter {%u} neexistuje v '%s'"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "formátovacie značky v 'msgid' a '%s' pre parameter {%u} nie sú rovnaké"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -532,7 +540,7 @@ msgstr ""
 "V direktíve číslo %u, parameter %u je typu '%s' ale parameter typu '%s' je "
 "očakávaný."
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -550,33 +558,33 @@ msgstr[2] ""
 "V direktíve číslo %u, je zadaných príliš veľa parametrov. Očakávané najviac %"
 "u parametre."
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "V direktíve číslo %u, '%c' nie je nasledované číslicou."
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "V direktíve číslo %u, parameter %d je negatívny."
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Reťazec končí v strede direktívy ~/.../."
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Nájdené '~%c' bez zodpovedajúvceho '~%c'."
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "V direktíve číslo %u, obidva modifikátory @ a : sú zadané."
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -585,26 +593,26 @@ msgstr ""
 "V direktíve číslo %u, '~:[' nie je nasledované dvoma klauzulami oddelenými "
 "'~;'."
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "V direktíve číslo %u, '~;' je použité na neplatnej pozícii."
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "Reťazec sa odkazuje na nejaký parameter nekompatibilnými spôsobmi."
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "formátovacie značky v 'msgid' a '%s' nie sú ekvivalentné"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "formátovacie značky v '%s' nie sú podmnožinou značiek z 'msgid'"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -613,12 +621,12 @@ msgstr ""
 "V direktíve číslo %u, určenie veľkosti nie je kompatibilné so zadanou "
 "konverziou '%c'."
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formátovacia značka pre parameter '%s' nie je v '%s'"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -626,13 +634,13 @@ msgstr ""
 "Reťazec sa odkazuje na parameter cez meno parametra aj cez nepomenované "
 "špecifikácie parametra."
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "Reťazec sa odkazuje na argument pomenovaný '%s' nekompatibilnými spôsobmi."
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -641,7 +649,7 @@ msgstr ""
 "formátovacie značky v 'msgid' predpokladajú mapovanie, ale značky v '%s' "
 "predpokladajú tuple"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -650,31 +658,33 @@ msgstr ""
 "formátovacie značky v 'msgid' predpokladajú tuple, ale značky v '%s' "
 "predpokladajú mapovanie"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "formátovacia značka pre parameter '%s' v '%s' nie je v 'msgid'"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "formátovacie značky v 'msgid' a '%s' pre parameter '%s' nie sú rovnaké"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "Viacnásobné odkazy na %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr ""
 "Reťazec sa odkazuje na premennú prostredia s názvom, ktorý obsahuje aj nie "
 "ASCII znaky."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -682,7 +692,7 @@ msgstr ""
 "Reťazec sa odkazuje na premennú prostredia s komplexnou syntaxou zátvoriek. "
 "Táto syntax je tu nepodporovaná z bezpečnostných dôvodov."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
@@ -690,92 +700,89 @@ msgstr ""
 "Reťazec sa odkazuje na premennú prostredia, ktorej hodnota môže byť "
 "rozdielna vo vnútri funkcií shellu."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Reťazec sa odkazuje na premennú prostredia s prázdnym názvom."
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr "V direktíve číslo %u, znak '%c' nie je číslica medzi 1 a 9."
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr "Znak, ktorý ukončuje direktívu číslo %u nie je číslica medzi 1 a 9."
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Autorské práva (C) %s Free Software Foundation, Inc.\n"
-"Toto je voľne šíriteľný softvér; pre podmienky kopírovania pozri zdrojový kód.\n"
-"Neposkytuje sa ŽIADNA záruka; ani čo sa týka OBCHODOVATEĽNOSTI alebo VHODNOSTI\n"
-"NA KONKRÉTNY ÚČEL.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napísal %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "príliš veľa parametrov"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Skúste `%s --help' a dozviete sa viac informácií.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Použitie: %s [VOĽBA]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Zobraziť hostiteľské meno stroja.\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Výstupný formát:\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 krátke meno hostiteľa\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -786,43 +793,47 @@ msgstr ""
 "kvalifikovaného\n"
 "                                doménového mena a prezývok\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresy pre meno hostiteľa\n"
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatívny výstup:\n"
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  zobraziť túto nápovedu a skončiť\n"
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               zobraziť informáciu o verzii a skončiť\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr ""
 "Správy o chybách zasielajte na adresu  (iba "
@@ -830,34 +841,35 @@ msgstr ""
 "Komentáre k slovenskému prekladu zasielajte na adresu .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "Nemôžem získať meno hostiteľa"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "povolený najviac jeden vstupný súbor"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s sa navzájom vylučujú"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Použitie: %s [VOĽBA] [VSTUPNÝSÚBOR]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -866,32 +878,32 @@ msgstr ""
 "Filtruje správy z prekladového katalógu podľa ich vlastností a mení tieto\n"
 "vlastnosti.\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Povinné parametre pre dlhé voľby sú povinnými aj pre skrátené voľby.\n"
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "Umiestnenie vstupného súboru:\n"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VSTUPNÝSÚBOR                vstupný PO súbor\n"
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -899,31 +911,31 @@ msgstr ""
 "  -D, --directory=ADRESÁR     pridať ADRESÁR do zoznamu pre vyhľadávané\n"
 "                              vstupné súbory\n"
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Ak nie je zadaný vstupný súbor alebo je -, je načítaný štandardný vstup.\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "Umiestnenie výstupného súboru:\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=SÚBOR     zapísať výstup do zadaného súboru\n"
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -932,12 +944,12 @@ msgstr ""
 "Výsledky sú zapísané na štandardný výstup ak nie je zadaný výstupný súbor\n"
 "alebo ak je -.\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr "Výber správy:\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -945,7 +957,7 @@ msgstr ""
 "      --translated            zachovať preložené, odstrániť nepreložené "
 "správy\n"
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -953,54 +965,54 @@ msgstr ""
 "      --untranslated          zachovať nepreložené, odstrániť preložené "
 "správy\n"
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              odstrániť nepresné preklady\n"
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            zachovať nepresné preklady\n"
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           odstrániť zastarané správy označené #~\n"
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         zachovať zastarané správy označené #~\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Úprava vlastností:\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             nastaviť všetky správy ako nepresné\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           nastaviť všetky správy ako nie nepresné\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          nastaviť všetky správy ako zastarané\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        nastaviť všetky správy ako nie zastarané\n"
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1008,27 +1020,27 @@ msgid ""
 msgstr ""
 "      --clear-fuzzy           nastaviť všetky správy ako nie nepresné\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=SÚBOR.po    spracovať len položky uvedené v SÚBOR.po\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=SÚBOR.po  spracovať len položky neuvedené v SÚBOR.po\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 synonymum pre --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1036,24 +1048,24 @@ msgstr ""
 "      --obsolete              synonymum pre --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax vstupného súboru:\n"
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      vstupný súbor má syntax Java .properties\n"
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1062,17 +1074,17 @@ msgstr ""
 "      --stringtable-input     vstupný súbor má syntax NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti výstupu:\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1080,9 +1092,9 @@ msgstr ""
 "  -e, --no-escape             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1091,29 +1103,29 @@ msgstr ""
 "C,\n"
 "                              bez rozšírených znakov\n"
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              zapísať súbor PO, aj keď bude prázdny\n"
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                zapísať .po súbor s použitím odsadzovania\n"
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1121,8 +1133,8 @@ msgstr ""
 "  -n, --add-location          generovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1130,32 +1142,32 @@ msgstr ""
 "      --strict                zapísať .po súbor presne doržiavajúci štýl\n"
 "                              Uniforum\n"
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     zapísať Java súbor .properties\n"
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    zapísať súbor NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ČÍSLO           nastaviť šírku výstupnej strany\n"
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1164,32 +1176,32 @@ msgstr ""
 "      --no-wrap               nezalamovať riadky správ dlhšie ako šírka\n"
 "                              výstupnej strany do viacerých riadkov\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generovať utriedený výstup\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "je uvedené nepovolené kritérium výberu (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Použitie: %s [VOĽBA] [VSTUPNÝSÚBOR]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1212,24 +1224,24 @@ msgstr ""
 "zabezpečí ich zachovanie iba z prvého PO súboru, ktorý ich definuje.\n"
 "Pozície v zdrojových súboroch budú zlúčené zo všetkých PO súborov.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  VSTUPNÝSÚBOR ...            vstupné súbory\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=SÚBOR      získať zoznam vstupných súborov zo SÚBORu\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Ak je vstupný súbor -, načítaný je štandardný vstup.\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1238,7 +1250,7 @@ msgstr ""
 "  -<, --less-than=POČET       vypísať správy, ktoré sú definované menej ako\n"
 "                              POČET-krát, štandardne nastavené na nekonečno\n"
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1247,7 +1259,7 @@ msgstr ""
 "  ->, --more-than=POČET       vypísať správy, ktoré sú defineované viac\n"
 "                              ako POČET-krát, štandardne nastavené na 0\n"
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1256,7 +1268,7 @@ msgstr ""
 "  -u, --unique                skratka pre --less-than=2, nastavuje výpis\n"
 "                              len unikátnych správ\n"
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
@@ -1264,7 +1276,7 @@ msgid ""
 msgstr ""
 "  -P, --properties-input      vstupné súbory májú syntax Java .properties\n"
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1274,12 +1286,12 @@ msgstr ""
 "      --stringtable-input     vstupné súbory majú syntax NeXTstep-GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NÁZOV         kódovanie pre výstup\n"
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1289,27 +1301,41 @@ msgstr ""
 "správu,\n"
 "                              nezlučovať viacero prekladov\n"
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "neboli zadané vstupné súbory"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "potrebné sú presne 2 vstupné súbory"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Použitie: %s [VOĽBA] def.po ref.pot\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1326,22 +1352,22 @@ msgstr ""
 "Keď nie je možné nájsť presnú zhodu, je použitý fuzzy algoritmus, ktorý\n"
 "umožňuje lepšiu kontrolu zhody.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      preklady\n"
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     odkazy na zdrojové súbory\n"
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modifikátory operácie:\n"
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1349,49 +1375,49 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          použije ref.pot na všetky domény v def.po\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "  -f, --use-fuzzy             použiť nepresné preklady vo výstupe\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --untranslated          zachovať nepreložené, odstrániť preložené "
 "správy\n"
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "upozornenie: táto správa nie je použitá"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "táto správa je použitá, ale nie je definovaná..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ale táto definícia je podobná"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "táto správa je použitá, ale nie je definovaná v %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "upozornenie: táto správa nie je použitá"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1399,12 +1425,12 @@ msgstr[0] "nájdených %d závažných chýb"
 msgstr[1] "nájdená %d závažná chyba"
 msgstr[2] "nájdené %d závažné chyby"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "musia byť uvedené minimálne dva súbory"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1424,7 +1450,7 @@ msgstr ""
 "komentáre budú zachované iba z prvého PO súboru, v ktorom sú definované.\n"
 "Pozície v zdrojových súboroch budú zlúčené zo všetkých PO súborov.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1433,41 +1459,41 @@ msgstr ""
 "  ->, --more-than=POČET       vypísať správy, ktoré sú defineované viac\n"
 "                              ako POČET-krát, štandardne nastavené na 1\n"
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           nezapisovať hlavičku s položkou `msgid \"\"'\n"
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konvertovať prekladový katalóg do iného kódovania znakov.\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cieľ konverzie:\n"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Predvolené kódovanie je kódovanie aktuálneho národného prostreda.\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                výstup s použitím odsadzovania\n"
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
@@ -1476,28 +1502,28 @@ msgstr ""
 "      --add-location          zachovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                presné dodržiavanie štýlu Uniforum\n"
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "nie sú zadané vstupné súbory"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr "potrebné je presne jeden vstupný súbor"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Použitie: %s [VOĽBA] VSTUPNÝSÚBOR\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1510,22 +1536,22 @@ msgstr ""
 "programom xgettext). Nepreloženým položkám je priradený preklad\n"
 "zhodný s msgid.\n"
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  VSTUPNÝSÚBOR                vstupný PO alebo POT súbor\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr "chýbajúci názov príkazu"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Použitie: %s [VOĽBA] PRÍKAZ [VOĽBA-PRÍKAZU]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1540,7 +1566,7 @@ msgstr ""
 "bude aj výstupom programu msgexec. Návratová hodnota programu msgexec je\n"
 "maximum návratových hodnôt všetkých spustení príkazu.\n"
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1549,42 +1575,42 @@ msgstr ""
 "Špeciálny vstavaný príkaz s názvom '0' vypisuje preklad nasledovaný nulovým\n"
 "bajtom. Výstup príkazu \"msgexec 0\" je použiteľný ako vstup pre \"xargs -0\".\n"
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=VSTUPNÝSÚBOR    vstupný PO súbor\n"
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr "zápis na štandardný výstup zlyhal"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "zápis do podprocesu %s zlyhal"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr "chýbajúci názov filtra"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "musí byť uvedený aspoň jeden sed skript"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Použitie: %s [VOĽBA] FILTER [VOĽBA-FILTRA]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Aplikovať filter na všetky preklady prekladového katalógu.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1594,18 +1620,18 @@ msgstr ""
 "vstupu\n"
 "a zapisuje upravené preklady na štandardný výstup.\n"
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Užitočné VOĽBY-FILTRA keď je použitý FILTER 'sed':\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SKRIPT     pridať SKRIPT k vykonávaným príkazom\n"
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1616,14 +1642,14 @@ msgstr ""
 "výkonávaným\n"
 "                                príkazom\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       potlačiť automatickú tlač priestoru vzorov\n"
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1631,12 +1657,12 @@ msgstr ""
 "      --no-escape             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                výstup s použitím odsadzovania\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1644,68 +1670,68 @@ msgstr ""
 "      --keep-header           zachovať položku hlavičky nezmenenú,\n"
 "                              neodfiltrovať ju\n"
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr "Ešte nie je implementované."
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "nemôžem nastaviť neblokujúce V/V na podproces %s"
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "komunikácia s podprocesom %s zlyhala"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "čítanie z podprocesu %s zlyhalo"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "podproces %s bol ukončený s ukončovacím kódom %d"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "parameter pre %s by malo byť len jedno interpunkčné znamienko"
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s vyžaduje špecifikáciu \"-d adresár\""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s vyžaduje špecifikáciu \"-l národné prostredie\""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s je platné len s %s alebo %s"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s je platné len s %s, %s alebo %s"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1713,7 +1739,7 @@ msgstr[0] "%d preložených správ"
 msgstr[1] "%d preložená správa"
 msgstr[2] "%d preložené správy"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1721,7 +1747,7 @@ msgstr[0] ", %d nepresných prekladov"
 msgstr[1] ", %d nepresný preklad"
 msgstr[2] ", %d nepresné preklady"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1729,17 +1755,17 @@ msgstr[0] ", %d nepreložených správ"
 msgstr[1] ", %d nepreložená správa"
 msgstr[2] ", %d nepreložené správy"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Použitie: %s [VOĽBA] menosúboru.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Generovať binárny katalóg správ z textového popisu prekladu.\n"
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1748,17 +1774,17 @@ msgstr ""
 "Povinné parametre dlhých volieb sú povinné aj pre krátke voľby.\n"
 "Podobne aj pre voliteľné parametre.\n"
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  menosúboru.po ...           vstupné súbory\n"
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mód činnosti:\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1767,7 +1793,7 @@ msgstr ""
 "  -j, --java                  mód Java: generovať triedu Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1777,12 +1803,12 @@ msgstr ""
 "alebo\n"
 "                              vyššie)\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                mód C#: generovať .dll súbor pre .NET\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1791,40 +1817,40 @@ msgstr ""
 "      --csharp-resources      režim zdrojov C#: generovať .resources súbor "
 "pre .NET\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   mód Tcl: generovať súbor .msg tcl/msgcat\n"
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    mód Qt: generovať Qt súbor .qm\n"
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                povoliť presne dodržaný mód Uniforum\n"
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Ak je výstupný súbor -, výstup je zapísaný na štandardný výstup.\n"
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Umiestnenie výstupného súboru v móde Java:\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ZDROJ        názov zdroja\n"
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1833,14 +1859,14 @@ msgstr ""
 "  -l, --locale=N_PROSTREDIE   názov národného prostredia, buď jazyk alebo\n"
 "                              jazyk_KRAJINA\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d ADRESÁR                  základný adresár adresárov hierarchie tried\n"
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1852,12 +1878,12 @@ msgstr ""
 "oddelené znakom \"_\". Voľba -d je povinná. Trieda je zapísaná do zadaného\n"
 "adresára.\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Umiestnenie výstupného súboru v režime C#:\n"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1866,7 +1892,7 @@ msgstr ""
 "  -d ADRESÁR                  základný adresár pre lokálne závislé .dll "
 "súbory\n"
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1876,17 +1902,17 @@ msgstr ""
 "adresára,\n"
 "ktorého názov závisí od národného prostredia.\n"
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Umiestnenie výstupného súboru v móde Tcl:\n"
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d ADRESÁR                  základný adresár katalógov správ .msg\n"
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1894,12 +1920,12 @@ msgid ""
 msgstr ""
 "Voľby -l a -d sú povinné. Súbor .msg je zapísaný do zadaného adresára.\n"
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretácia vstupného súboru:\n"
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1910,14 +1936,14 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          kontrolovať jazykovo závislé formátované "
 "reťazce\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -1925,7 +1951,7 @@ msgid ""
 msgstr ""
 "      --check-header          overiť prítomnosť a obsah položky hlavičky\n"
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1935,7 +1961,7 @@ msgstr ""
 "domény\n"
 "                                a voľbou --output-file\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1944,7 +1970,7 @@ msgstr ""
 "  -C, --check-compatibility   kontrolovať, či sa GNU msgfmt správa tak ako\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1955,12 +1981,12 @@ msgstr ""
 "skratiek\n"
 "                                pre položky menu\n"
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             použiť nepresné preklady vo výstupe\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -1968,7 +1994,7 @@ msgstr ""
 "  -a, --alignment=POČET       zarovnať reťazce na POČET bajtov (štandardne: %"
 "d)\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -1976,86 +2002,86 @@ msgstr ""
 "      --no-hash               binárny súbor nebude obsahovať hašovaciu "
 "tabuľku\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            zobraziť štatistiky prekladov\n"
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               zvýšiť úroveň táravosti\n"
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "upozornenie: hlavička súboru PO chýba alebo je neplatná\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "upozornenie: konverzia znakovej sady nebude fungovať\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "upozornenie: hlavička súboru PO je nepresná\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "upozornenie: staršie verzie msgfmt vrátia pri tomto chybu\n"
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "meno domény \"%s\" nie je použitelné ako meno súboru"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "meno domény \"%s\" nie je použitelné ako meno súboru: použije sa predpona"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direktíva `domain %s' bola ignorovaná"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "prázdna položka `msgstr' bola ignorovaná"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "nepresná položka `msgstr' bola ignorovaná"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pri čítaní súboru \"%s\""
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr "voľba '%c' nemôže byť použitá pred špecifikovaným 'K', 'T' alebo 'C'"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2064,7 +2090,7 @@ msgstr ""
 "Vyberie všetky správy z prekladového katalógu, ktoré vyhovujú zadanému\n"
 "vzoru alebo sú v zadaných zdrojových súboroch.\n"
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2132,7 +2158,7 @@ msgstr ""
 "  -f, --file=SÚBOR            získať VZOR zo SÚBORu\n"
 "  -i, --ignore-case           ignorovať rozlíšenie veľkých a malých písmen\n"
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2141,18 +2167,18 @@ msgstr ""
 "C,\n"
 "                              bez rozšírených znakov\n"
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generovať utriedený výstup\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2163,7 +2189,7 @@ msgstr ""
 "ABOUT-NLS. Toto je potrebné na to, aby ste mohli otestovať\n"
 "vaše preklady.\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2174,12 +2200,12 @@ msgstr ""
 "Zadajte, prosím, národné prostredie pomocou voľby --locale alebo\n"
 "výstupný .po súbor pomocou voľby --output-file.\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "Vytvorený %s.\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2188,12 +2214,12 @@ msgstr ""
 "Vytvorí nový PO súbor, inicializuje meta informácie podľa hodnôt z prostredia\n"
 "používateľa.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=VSTUPNÝSÚBOR    vstupný POT súbor\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2204,12 +2230,12 @@ msgstr ""
 "adresári.\n"
 "Ak je -, načítaný je štandardný vstup.\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=SÚBOR     zapísať výstup do zadaného PO súboru\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2219,12 +2245,12 @@ msgstr ""
 "nastavenia národného prostredia používateľa. Ak je -, výstup je zapísaný na\n"
 "štandardný výstup.\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          nastaviť cieľové národné prostredie\n"
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2232,7 +2258,7 @@ msgstr ""
 "      --no-translator         označiť, že PO súbor je generovaný "
 "automaticky\n"
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2240,12 +2266,12 @@ msgstr ""
 "Nájdených viac ako jeden .pot súbor.\n"
 "Prosím zadajte vstupný .pot súbor pomocou voľby --input.\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "chyba pri čítaní adresára"
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2253,14 +2279,14 @@ msgstr ""
 "V aktuálnom adresári nebol nájdený žiaden .pot súbor.\n"
 "Prosím zadajte vstupný .pot súbor pomocou voľby --input.\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s zlyhal s ukončovacím kódom %d"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2277,28 +2303,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "Slovenské preklady pre balík %s"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "aktuálna znaková sada \"%s\" nie je prenositeľné meno kódovania"
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "dve rozdielne znakové sady \"%s\" a \"%s\" vo vstupnom súbore"
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "vstupný súbor \"%s\" nemá v hlavičke uvedenú znakovú sadu"
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2306,19 +2332,19 @@ msgid ""
 msgstr ""
 "doména \"%s\" vo vstupnom súbore \"%s\" nemá v hlavičke uvedenú znakovú sadu"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "cieľová znaková sada \"%s\" nie je prenositeľné meno kódovania."
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "upozornenie: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2328,7 +2354,7 @@ msgstr ""
 "UTF-8.\n"
 "Konvertujem výstup do UTF-8.\n"
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2341,7 +2367,7 @@ msgstr ""
 "Konvertujem výstup do UTF-8.\n"
 "Iné výstupné kódovanie si môžete zvoliť pomocou voľby --to-code.\n"
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2350,7 +2376,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2363,12 +2389,12 @@ msgstr ""
 "Výstup z '%s' môže byť nesprávny.\n"
 "Možné riešenia sú:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Nastaviť LC_ALL na národné prostredie s kódovaním %s.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2379,7 +2405,7 @@ msgstr ""
 "  potom použiť '%s',\n"
 "  potom konvertovať späť na %s pomocou 'msgconv'.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2392,7 +2418,7 @@ msgstr ""
 "  potom použiť '%s',\n"
 "  potom konvertovať späť na %s pomocou 'msgconv'.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2404,26 +2430,26 @@ msgstr ""
 "Výstup z '%s' môže byť nesprávny.\n"
 "Možnou obchádzkou je nastavenie LC_ALL=C.\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "výraz pre množné číslo môže nadobúdať záporné hodnoty"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ale výraz pre množné číslo môže nadobúdať hodnoty väčšie ako "
 "%lu"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "výraz pre množné číslo môže spôsobiť delenie nulou"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "výraz pre množné číslo môže spôsobiť celočíselné pretečenie"
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2431,40 +2457,40 @@ msgstr ""
 "výraz pre množné číslo môže spôsobiť aritmetickú výnimku, pravdepodobne "
 "delenie nulou"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Skúste použiť nasledujúce, platné pre %s:\n"
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "katalóg správ má preklady s množnými číslami..."
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ale v hlavičke chýba \"plural=VÝRAZ\""
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ale v hlavičke chýba \"nplurals=ČÍSLO\""
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "neplatná hodnota nplurals"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "neplatný výraz pre množné číslo"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2472,7 +2498,7 @@ msgstr[0] "...ale niektoré správy majú len %lu tvarov množných čísel"
 msgstr[1] "...ale niektoré správy majú len %lu tvar množného čísla"
 msgstr[2] "...ale niektoré správy majú len %lu tvary množných čísel"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2480,7 +2506,7 @@ msgstr[0] "...ale niektoré správy majú %lu tvarov množných čísel"
 msgstr[1] "...ale niektoré správy majú %lu tvar množného čísla"
 msgstr[2] "...ale niektoré správy majú %lu tvary množných čísel"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2488,82 +2514,82 @@ msgstr ""
 "katalóg správ má preklady s množnými číslami, ale v hlavičke chýba \"Plural-"
 "Forms: nplurals=ČÍSLO; plural=VÝRAZ;\""
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "položky `msgid' a `msgid_plural' nezačínajú obe s '\\n'"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "položky `msgid' a `msgstr[%u]' nezačínajú obe s '\\n'"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "položky `msgid' a `msgstr' nezačínajú obe s '\\n'"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "položky `msgid' a `msgid_plural' nie sú obe ukončené s '\\n'"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "položky `msgid' a `msgstr[%u]' nie sú obe ukončené s '\\n'"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "položky `msgid' a `msgstr' nie sú obe ukončené s '\\n'"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "spracovanie množných čísel je rozšírením GNU"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr chýba značka klávesovej skratky '%c'"
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr obsahuje príliš veľa značiek klávesových skratiek '%c'"
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "hlavičková položka `%s' chýba v hlavičke\n"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "hlavičková položka `%s' má začínať na začiatku riadku\n"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "niektoré položky hlavičky ešte obsahujú počiatočné štandardné hodnoty\n"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "položka `%s' ešte obsahuje počiatočnú štandardnú hodnotu\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "chyba pri otváraní súboru \"%s\" na čítanie"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "vstupný súbor nemá v hlavičke uvedenú znakovú sadu"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2572,7 +2598,7 @@ msgstr ""
 "Nemôžem konvertovať z \"%s\" do \"%s\". %s spolieha na iconv() a iconv() "
 "nepodporuje takúto konverziu."
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2581,8 +2607,8 @@ msgstr ""
 "Konverzia z \"%s\" do \"%s\" zavedie duplicity: niektoré rozdielne msgid sa "
 "stanú rovnakými."
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2721,17 +2747,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       potlačiť indikátory postupu\n"
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "táto správa by mala definovať tvary množného čísla"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "táto správa by nemala definovať tvary množného čísla"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2740,26 +2766,26 @@ msgstr ""
 "%sNačítané %ld starých + %ld odkazov, %ld zlučených, %ld nepresných, %ld "
 "chýbajucich, %ld zrušených.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " hotovo.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s a explicitné mená súborov sa navzájom vylučujú"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Použitie: %s [VOĽBA] [SÚBOR]...\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Konvertovať binárny katalóg správ na .po súbor v Uniforum štýle.\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2767,12 +2793,12 @@ msgid ""
 msgstr ""
 "  -j, --java                  mód Java: vstup je trieda Java ResourceBundle\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                režim C#: vstup je .dll súbor .NET\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2781,24 +2807,24 @@ msgstr ""
 "      --csharp-resources      režim zdrojov C#: vstup je .resources súbor "
 "pre .NET\n"
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   mód Tcl: vstup je súbor .msg tcl/msgcat\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  SÚBOR ...                   vstupné .mo súbory\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Umiestnenie vstupného súboru v móde Java:\n"
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2808,12 +2834,12 @@ msgstr ""
 "Názov triedy je získaný pridaním názvu národného prostredia k názvu zdroja,\n"
 "oddelených znakom \"_\". Trieda je umiestnená pomocou CLASSPATH.\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Umiestnenie vstupného súboru v režime C#:\n"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2822,12 +2848,12 @@ msgstr ""
 "Voľby -l a -d sú povinné. Súbor .dll je umiestnený v podadresári zadaného,\n"
 "ktorého názov závisí od národného prostredia adresára.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Umiestnenie vstupného súboru v móde Tcl:\n"
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2835,20 +2861,20 @@ msgid ""
 msgstr ""
 "Voľby -l a -d sú povinné. Súbor .msg je umiestnený v zadanom adresári.\n"
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 "  -i, --indent                zapísať pomocou odsadeného výstupného štýlu\n"
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict                zapísať súbor s presne doržaným štýlom "
 "uniforum\n"
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2869,12 +2895,12 @@ msgstr ""
 "z prvého prekladu. Pozície v súboroch budú zlúčené. Pri použití voľby\n"
 "--unique budú duplikáty potlačené.\n"
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              zobraziť len duplikáty\n"
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2883,12 +2909,12 @@ msgstr ""
 "  -u, --unique                zobraziť len unikátne správy, potlačiť "
 "duplikáty\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr "<štandardný vstup>"
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2897,7 +2923,7 @@ msgstr ""
 "Znaková sada \"%s\" nie je prenositeľné meno kódovania.\n"
 "Konverzia hlásení do znakovej sady používateľa nemusí fungovať.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2906,7 +2932,7 @@ msgstr ""
 "Znaková sada \"%s\" nie je podporovaná. %s spolieha na iconv()\n"
 "a iconv() nepodporuje \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2914,15 +2940,15 @@ msgstr ""
 "Inštalácia GNU balíka libiconv a následná preinštalácia\n"
 "balíka GNU gettext by mala tento problém odstrániť.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Pokračovanie aj napriek tomu. Možno sa vyskytnú chyby pri analýze."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Pokračovanie aj napriek tomu."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2931,7 +2957,7 @@ msgstr ""
 "Znaková sada \"%s\" nie je podporovaná. %s spolieha na iconv().\n"
 "Táto verzia bola preložená bez iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2939,150 +2965,150 @@ msgstr ""
 "V hlavičke chýba znaková sada.\n"
 "Konverzia hlásení do znakovej sady používateľa nebude fungovať.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "nekonzistentné použitie #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "chýba sekcia `msgstr[]'"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "chýba sekcia `msgid_plural'"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "chýba sekcia `msgstr'"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "prvé množné číslo má nenulový index"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "množné číslo má nesprávny index"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "vyskytlo sa príliš veľa chýb, ukončuje sa program"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neplatná viacznaková sekvencia"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "nekompletná viacznaková sekvencia na konci súboru"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "nekompletná viacznaková sekvencia na konci riadku"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr "iconv zlyhal"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "neznáme kľúčové slovo \"%s\""
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "neplatná riadiaca sekvencia"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "koniec súboru uprostred reťazca"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "koniec riadku uprostred reťazca"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento súbor nesmie obsahovať direktívy pre doménu"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "duplicitná definícia správy"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...toto je miesto prvého definovania"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "súbor \"%s\" je skrátený"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "súbor \"%s\" obsahuje reťazce, ktoré nie sú ukončené nulou"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "súbor \"%s\" nie je vo formáte GNU .mo"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "súbor \"%s\" obsahuje reťazec, ktorý nie je ukončený nulou, na %s"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%lu: upozornenie: neplatná syntax \\uxxxx pre znak Unicode"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: upozornenie: neukončený reťazec"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s:%lu: upozornenie: chyba syntaxe"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%lu: upozornenie: neukončený pár kľúč/hodnota"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%lu: upozornenie: chyba syntaxe, očakávané ';' po reťazci"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%lu: upozornenie: chyba syntaxe, očakávané '=' alebo ';' po reťazci"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Napísal %s.\n"
@@ -3091,43 +3117,43 @@ msgstr "Napísal %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "chyba pri otváraní súboru \"%s\" na čítanie"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr "očakávané dva parametre"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Použitie: %s [VOĽBA] URL SÚBOR\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3136,12 +3162,12 @@ msgstr ""
 "Stiahne a zobrazí obsah z URL. Ak URL nie je dostupné, použije sa SÚBOR\n"
 "z lokálneho disku.\n"
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr "chyba pri zápise na štandardný výstup"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3150,7 +3176,7 @@ msgstr ""
 "Nie je možné zapísať viacnásobné prekladové domény do jedného súboru so "
 "syntaxou Java .properties. Skúste použiť namiesto toho syntax PO."
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3159,7 +3185,7 @@ msgstr ""
 "Nie je možné zapísať viacnásobné prekladové domény do jedného súboru so "
 "syntaxou NeXTstep/GNUstep .strings."
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
@@ -3168,7 +3194,7 @@ msgstr ""
 "katalóg správ má preklady s množnými číslami, ale výstupný formát ich "
 "nepodporuje."
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3178,7 +3204,7 @@ msgstr ""
 "nepodporuje. Skúste pregenerovať Java triedu pomocou \"msgfmt --java\", "
 "namiesto súboru vlastností."
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3186,67 +3212,59 @@ msgstr ""
 "katalóg správ má preklady s množnými číslami, ale výstupný formát ich "
 "nepodporuje."
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "nie je možné vytvoriť výstupný súbor \"%s\""
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "štandardný výstup"
 
-#: src/write-csharp.c:618
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"katalóg správ má preklady s množnými číslami,\n"
-"ale formát C# .resources nepodporuje množné čísla\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "zlyhalo vytvorenie adresára \"%s\""
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "kompilácia triedy C# zlyhalo, prosím skúste --verbose"
 
-#: src/write-java.c:920
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"katalóg správ má preklady s množnými číslami,\n"
-"ale formát C# .resources nepodporuje množné čísla\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "kompilácia triedy C# zlyhalo, prosím skúste --verbose"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nie je platným názvom triedy Java: %s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "kompilácia triedy Java zlyhalo, prosím skúste --verbose alebo nastavte $JAVAC"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"kompilácia triedy Java zlyhalo, prosím skúste --verbose alebo nastavte $JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba pri otváraní súboru  \"%s\" na zápis"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "internacionalizované správy nesmú obsahovať riadiacu sekvenciu `\\%c'"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3259,7 +3277,7 @@ msgstr ""
 "ako vy. Zvážte namiesto to použitie msgid len s ASCII znakmi.\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3272,7 +3290,7 @@ msgstr ""
 "ako vy. Zvážte namiesto to použitie msgid len s ASCII znakmi.\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3280,7 +3298,7 @@ msgstr ""
 "katalóg správ má preklady s množnými číslami,\n"
 "ale formát katalógu správ Qt nepodporuje množné čísla\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 #, fuzzy
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
@@ -3292,7 +3310,7 @@ msgstr ""
 "formát katalógu správ Qt podporuje Unicode len v preložených reťazcoch\n"
 "a nie v nepreložených reťazcoch\n"
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3302,12 +3320,12 @@ msgstr ""
 "formát katalógu správ Qt podporuje Unicode len v preložených reťazcoch\n"
 "a nie v nepreložených reťazcoch\n"
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "chyba počas zápisu do do podprocesu %s"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3316,7 +3334,7 @@ msgstr ""
 "katalóg správ má preklady s množnými číslami,\n"
 "ale formát C# .resources nepodporuje množné čísla\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3324,7 +3342,7 @@ msgstr ""
 "katalóg správ má preklady s množnými číslami,\n"
 "ale formát C# .resources nepodporuje množné čísla\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3333,7 +3351,7 @@ msgstr ""
 "katalóg správ má preklady s množnými číslami,\n"
 "ale formát katalógu správ Tcl nepodporuje množné čísla\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3341,27 +3359,27 @@ msgstr ""
 "katalóg správ má preklady s množnými číslami,\n"
 "ale formát katalógu správ Tcl nepodporuje množné čísla\n"
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozornenie: neukončený reťazec"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: upozornenie: neukončený regulárny výraz"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozornenie: neukončená znaková konštanta"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornenie: neukončený znakový reťazec"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3370,7 +3388,7 @@ msgstr ""
 "Nie ASCII reťazec na %s%s.\n"
 "Presím zadajte kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3379,7 +3397,7 @@ msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Presím zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3388,7 +3406,7 @@ msgstr ""
 "%s:%d: Nekompletná dlhá viacbajtová postupnosť.\n"
 "Presím zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3397,7 +3415,7 @@ msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci súboru.\n"
 "Presím zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3406,12 +3424,12 @@ msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci riadku.\n"
 "Presím zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv zlyhal"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3420,32 +3438,32 @@ msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Presím zadajte kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: upozornenie: neplatný znak Unicode"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: upozornenie: neukončená reťazcová konštanta"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: upozornenie: nájdené ')' tam, kde bolo očakávané '}'"
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: upozornenie: nájdené '}' tam, kde bolo očakávané ')'"
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3454,42 +3472,47 @@ msgstr ""
 "Jazyk \"glade\" je nepodporovaný. %s spolieha na expat.\n"
 "Táto verzia bola preložená bez expat.\n"
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: upozornenie: neukončený reťazec"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: nepodarilo sa nájsť ukončenie reťazca \"%s\" pred koncom súboru"
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: chýbajúca pravá zátvorka v \\x{ŠESTNÁSTKOVÉČÍSLO}"
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: neplatná interpolácia (\"\\l\") 8-bitového znaku \"%c\""
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: neplatná interpolácia (\"\\u\") 8-bitového znaku \"%c\""
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: neplatná interpolácia premennej na \"%c\""
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: neplatná interpolácia (\"\\L\") 8-bitového znaku \"%c\""
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: neplatná interpolácia (\"\\U\") 8-bitového znaku \"%c\""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, fuzzy, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3499,7 +3522,7 @@ msgstr ""
 "Nie ASCII reťazec na %s%s.\n"
 "Presím zadajte kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3509,7 +3532,7 @@ msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Presím zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3519,7 +3542,7 @@ msgstr ""
 "%s:%d: Nekompletná dlhá viacbajtová postupnosť.\n"
 "Presím zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3529,7 +3552,7 @@ msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci súboru.\n"
 "Presím zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3539,7 +3562,7 @@ msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci riadku.\n"
 "Presím zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3549,27 +3572,27 @@ msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Presím zadajte kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: neplatná definícia reťazca"
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: chýbajúce číslo za #"
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: neplatný výraz reťazca"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3578,29 +3601,29 @@ msgstr ""
 "%s:%lu: upozornenie: syntax $\"...\" je neodporúčaná z bezpečnostných "
 "dôvodov; použite namiesto toho eval_gettext"
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing nesmie byť použité ak je výstup posielaný na štandardný "
 "výstup"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nemôže pracovať bez kľúčových slov, ktoré má hľadať"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "upozornenie: súbor `%s' s príponou `%s' je neznámy; skúsim C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extrahovať preložiteľné reťazce zo zadaných vstupných súborov.\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3609,12 +3632,12 @@ msgstr ""
 "  -d, --default-domain=NÁZOV  použiť NÁZOV.po pre výstup (namiesto messages."
 "po)\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=SÚBOR          zapísať výstup do zadaného súboru\n"
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3622,12 +3645,12 @@ msgstr ""
 "  -p, --output-dir=ADRESÁR    výstupné súbory budú umiestnené v adresári "
 "ADRESÁR\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Voľba jazyka vstupného súboru:\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3646,19 +3669,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   skratka pre --language=C++\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Štandardne je jazyk odhadnutý podľa prípony vstupného súboru\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3667,24 +3690,24 @@ msgstr ""
 "      --from-code=NÁZOV       kódovanie vstupných súborov\n"
 "                                (s výnimkou pre Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Štandardne sa predpokladá, že vstupné súbory sú v kódovaní ASCII.\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         spojiť správy s existujúcim súborom\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=SÚBOR.po  položky zo súboru SÚBOR.po nie sú "
 "extrahované\n"
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3695,17 +3718,17 @@ msgstr ""
 "riadky)\n"
 "                              do výstupného súboru\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Špecifické voľby jazyk:\n"
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrahovať všetky reťazce\n"
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3718,7 +3741,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3728,7 +3751,7 @@ msgstr ""
 "                              (bez SLOVO znamená: nepoužiť predvolené\n"
 "                              kľúčové slová)\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3739,7 +3762,7 @@ msgstr ""
 "číslo\n"
 "                              ARG kľúčového slova SLOVO\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3752,32 +3775,37 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             poznať ANSI C trojznaky na vstupe\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (len jazyky C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    rozoznať formát reťazcov Qt\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (len jazyk C++)\n"
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    rozoznať formát reťazcov Qt\n"
+
+#: src/xgettext.c:863
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    rozoznať formát reťazcov Qt\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3786,19 +3814,19 @@ msgstr ""
 "formátovacích\n"
 "                              reťazcov\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapísať Java súbor .properties\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=REŤAZEC nastaviť držiteľa autorských práv vo "
 "výstupe\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3806,7 +3834,19 @@ msgstr ""
 "      --foreign-user          vynechať informáciu o autorských právach FSF\n"
 "                              pre cudzieho používateľa\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+"      --copyright-holder=REŤAZEC nastaviť držiteľa autorských práv vo "
+"výstupe\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3815,7 +3855,7 @@ msgstr ""
 "chýb\n"
 "                                   v msgid\n"
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3824,7 +3864,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=REŤAZEC] použiť REŤAZEC alebo \"\" ako predponu pre\n"
 "                                položky msgstr\n"
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3833,7 +3873,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=REŤAZEC] použiť REŤAZEC alebo \"\" ako príponu pre\n"
 "                                položky msgstr\n"
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3841,16 +3881,16 @@ msgid ""
 msgstr ""
 "Parameter pre --flag nemá tvar :<č_param>:[pass-]: %s"
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "štandardný vstup"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: upozornenie: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3859,7 +3899,7 @@ msgstr ""
 "Aj keď je použité v pozícii formátovacieho reťazca, %s nie je platný "
 "formátovací reťazec %s. Dôvod: %s\n"
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3868,7 +3908,7 @@ msgstr ""
 "Aj keď je to tak deklarované, %s nie je platný formátovací reťazec %s. "
 "Dôvod: %s\n"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3877,7 +3917,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3887,27 +3927,27 @@ msgstr ""
 "gettext(\"\") vráti hlavičku s meta informáciami\n"
 "a nie prázdny reťazec.\n"
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "nejednoznačný parameter %s pre %s"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3920,15 +3960,48 @@ msgstr ""
 "MSGID_BUGS_ADDRESS; inak prosím zadajte voľbu príkazového\n"
 "riadku --msgid-bugs-address.\n"
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "jazyk `%s' je neznámy"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Viacnásobné odkazy na %%%c."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Autorské práva (C) %s Free Software Foundation, Inc.\n"
+#~ "Toto je voľne šíriteľný softvér; pre podmienky kopírovania pozri zdrojový "
+#~ "kód.\n"
+#~ "Neposkytuje sa ŽIADNA záruka; ani čo sa týka OBCHODOVATEĽNOSTI alebo "
+#~ "VHODNOSTI\n"
+#~ "NA KONKRÉTNY ÚČEL.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "katalóg správ má preklady s množnými číslami,\n"
+#~ "ale formát C# .resources nepodporuje množné čísla\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "katalóg správ má preklady s množnými číslami,\n"
+#~ "ale formát C# .resources nepodporuje množné čísla\n"
+
 #~ msgid "The %%J directive is only allowed at the beginning of the string."
 #~ msgstr "Direktíva %%J je povolená len na začiatku reťazca."
 
diff --git a/gettext-tools/po/sl.po b/gettext-tools/po/sl.po
index 2e68a853d..dbe8c9b02 100644
--- a/gettext-tools/po/sl.po
+++ b/gettext-tools/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-23 09:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-10-19 14:00+0200\n"
 "Last-Translator: Primož Peterlin \n"
 "Language-Team: Slovenian \n"
diff --git a/gettext-tools/po/sr.po b/gettext-tools/po/sr.po
index 2ac84bd52..c3056a04f 100644
--- a/gettext-tools/po/sr.po
+++ b/gettext-tools/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2004-02-16 16:00+0100\n"
 "Last-Translator: Danilo Segan \n"
 "Language-Team: Serbian \n"
@@ -16,89 +16,90 @@ msgstr ""
 "Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :  (n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, fuzzy, c-format
 msgid "invalid argument %s for %s"
 msgstr "неисправан аргумент „%s“ за  %s"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, fuzzy, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Исправни аргументи су:"
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "не могу да нађем привремени директоријум, поставите $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "не могу да направим привремени директоријум помоћу шаблона „%s“"
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "не могу да направим излазну датотеку „%s“"
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "не могу да направим привремени директоријум помоћу шаблона „%s“"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "грешка уписа"
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "грешка приликом отварања „%s“ за читање"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "не могу да отворим резервну датотеку „%s“ ради уписа"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "грешка при читању „%s“"
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "грешка при упису „%s“"
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "грешка након читања „%s“"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "неуспешан fdopen()"
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
 "Нисам нашао Јава преводилац, покушајте да инсталирате gcj или поставите "
 "$JAVAC"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, fuzzy, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
@@ -109,123 +110,123 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Непозната системска грешка"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s: неуспешан подпроцес"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: опција „%s“ није једнозначна\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: опција „--%s“ не дозвољава аргументе\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: опција „%c%s“ не дозвољава аргументе\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: опција „%s“ захтева аргумент\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: непозната опција „--%s“\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: непозната опција „%c%s“\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: неисправна опција %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: неисправна опција -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: опција захтева аргумент -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: опција „-W %s“ није једнозначна\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "не могу да направим „%s“"
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "грешка при писању датотеке „%s“"
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Нисам нашао Јава преводилац, покушајте да инсталирате gcj или поставите "
 "$JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Нисам нашао виртуелну Јава машину, покушајте да инсталирате gij или да "
 "поставите $JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "У/И грешка подпроцеса %s"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "меморија исцрпљена"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "не могу да направим цевку"
@@ -249,73 +250,73 @@ msgstr "не могу да направим цевку"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "Неуспешан DuplicateHandle са грешком 0x%08x"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "неуспешан _open_osfhandle"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "подпроцес од %s"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "подпроцес од %s је примио кобни сигнал %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr "„%s“ није исправна ниска формата %s, за разлику од „msgid“. Разлог: %s"
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr ""
 "спецификација формата за %u. аргумент, као у „%s“, не постоји у „msgid“"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "спецификација формата за %u. аргумент не постоји у „%s“"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "спецификације формата у „msgid“ и „%s“ за %u. аргумент нису исте"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, fuzzy, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "У %u. директиви, „~;“ се користи на неисправном положају."
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -324,100 +325,107 @@ msgstr ""
 "У %u. директиви, члан након „<“ не представља име макроа спецификације "
 "формата. Исправна имена макроа су пописана у ИСО Це 99, одељак 7.8.1."
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "У %u. директиви, члан након „<“ није праћен „>“."
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "Ниска позива %u. аргумент, али занемарује %u. аргумент."
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "не поклапа се број спецификација формата у „msgid“ и „%s“"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "У %u. директиви, „{“ није праћено бројем аргумента."
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, fuzzy, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "У %u. директиви, „{“ није праћено бројем аргумента."
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "Ниска се завршава усред директиве: нађох „{“ без одговарајућег „}“."
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, fuzzy, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "У %u. директиви, знак „%c“ не представља цифру између 1 и 9."
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, fuzzy, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "У %u. директиви, „~;“ се користи на неисправном положају."
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr "Ниска почиње усред директиве: нађох „}“ без одговарајућег „{“."
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, fuzzy, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Ниска се завршава усред директиве."
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "У %u. директиви, %d. аргумент је негативан."
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "У %u. директиви, аргумент са бројем 0 није позитиван цео број."
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
+
+#: src/format-gcc-internal.c:404
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "У %u. директиви, %d. аргумент је негативан."
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Ниска се завршава усред директиве."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -425,27 +433,27 @@ msgstr ""
 "Ниска се позива на аргументе и помоћу апсолутног броја аргумента и помоћу "
 "обичних спецификација аргумената."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "У %u. директиви, аргумент са бројем 0 није позитиван цео број."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr "У %u. директиви, ширина нултог аргумента није позитиван цео број."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr "У %u. директиви, прецизност нултог аргумента није позитиван цео број."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
@@ -453,7 +461,7 @@ msgid ""
 msgstr ""
 "У %u. директиви, знак „%c“ не представља исправну ознаку за претварање."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -461,12 +469,12 @@ msgid ""
 msgstr ""
 "Знак који завршава %u. директиву не представља исправну ознаку за претварање."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Ниска се позива на %u. аргумент на несагласне начине."
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -474,18 +482,18 @@ msgid ""
 msgstr ""
 "У %u. директиви, подниска „%s“ не представља исправан стил датума и времена."
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "У %u. директиви, „%s“ није праћено запетом."
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "У %u. директиви, подниска „%s“ не представља исправан стил бројева."
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -494,19 +502,19 @@ msgstr ""
 "У %u. директиви, број аргумента није праћен запетом и неким од „%s“, „%s“, „%"
 "s“, „%s“."
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "У %u. директиви, избор не садржи број."
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr "У %u. директиви, избор садржи број који није праћен „<“, „#“ или „%s“."
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -514,19 +522,19 @@ msgid ""
 msgstr ""
 "спецификација формата за аргумент {%u}, као у „%s“, не постоји у „msgid“"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "спецификација формата за аргумент {%u} не постоји у „%s“"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "нису једнаке спецификације формата у „msgid“ и „%s“ за аргумент {%u}"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -535,7 +543,7 @@ msgstr ""
 "У %u. директиви, %u. параметар је типа „%s“ а очекиван је параметар типа „%"
 "s“."
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -550,33 +558,33 @@ msgstr[1] ""
 msgstr[2] ""
 "У %u. директиви, дато је превише параметара; очекивах највише %u параметара."
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "У %u. директиви, „%c“ није праћено цифром."
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "У %u. директиви, %d. аргумент је негативан."
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Ниска се завршава усред директиве ~/.../."
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Нађох „~%c“ без одговарајућег „~%c“."
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "У %u. директиви, дата су оба измењивача „@“ и „:“."
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -584,26 +592,26 @@ msgid ""
 msgstr ""
 "У %u. директиви, „~:[“ није праћено са две наредбе, раздвојене помоћу „~;“."
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "У %u. директиви, „~;“ се користи на неисправном положају."
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "Ниска се позива на неке аргументе на несагласан начин."
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "спецификације формата у „msgid“ и „%s“ нису еквивалентне"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "спецификакције формата у „%s“ не представљају подскуп оних из „msgid“"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -611,12 +619,12 @@ msgid ""
 msgstr ""
 "У %u. директиви, ознака величине је несагласна са ознаком претварања „%c“."
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "спецификација формата за аргумент „%s“ не постоји у „%s“"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -624,12 +632,12 @@ msgstr ""
 "Ниска позива аргументе и кроз имена аргумената и кроз неименоване наводе "
 "аргумената."
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Ниска позива аргумент са именом „%s“ на несагласне начине."
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -638,7 +646,7 @@ msgstr ""
 "спецификација формата у „msgid“ очекује мапирање, а они у „%s“ очекују н-"
 "торку"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -647,7 +655,7 @@ msgstr ""
 "спецификација формата у „msgid“ очекује н-торку, а они у „%s“ очекују "
 "мапирање"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -655,22 +663,24 @@ msgid ""
 msgstr ""
 "спецификација формата за аргумент „%s“, као у „%s“, не постоји у „msgid“"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "нису исте спецификације формата у „msgid“ и „%s“ за аргумент „%s“"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "Вишеструко позивање %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Ниска позива променљиву љуске помоћу не-АСКРИ имена."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -678,7 +688,7 @@ msgstr ""
 "Ниска позива променљиву љуске помоћу сложене синтаксе заграда љуске. Ова "
 "синтакса овде није подржана из безбедносних разлога."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
@@ -686,91 +696,89 @@ msgstr ""
 "Ниска позива променљиву љуске чија вредност може бити другачија у функцијама "
 "љуске."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Ниска позива променљиву љуске празног имена."
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr "У %u. директиви, знак „%c“ не представља цифру између 1 и 9."
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr "Знак који завршава %u. директиву није цифра између 1 и 9."
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Сва права задржана © %s Free Software Foundation, Inc.\n"
-"Ово је слободан софтвер; погледајте изворни код за услове умножавања. НЕМА\n"
-"гаранције; чак ни за употребљивост или одређену намену.\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Написа %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "превише аргумената"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Пробајте „%s --help“ за више података.\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЈА]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Испиши име машине.\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "Излазни облик:\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 кратко име рачунара\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -780,74 +788,79 @@ msgstr ""
 "  -f, --fqdn, --long          дуго име рачунара, садржи пуно име домена и \n"
 "                                надимке\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адресе за име рачунара\n"
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Обавештајни излаз:\n"
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  прикажи ову помоћ и заврши\n"
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               испиши податке о издању и заврши\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "Пријавите грешке на .\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "не могу да сазнам име домаћина"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "дозвољена највише једна улазна датотека"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s и %s су међусобно искључиви"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Употреба: %s [ОПЦИЈА] [УЛАЗНА-ДАТОТЕКА]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -856,32 +869,32 @@ msgstr ""
 "Филтрира поруке каталога превода према њиховим особинама, и барата\n"
 "тим особинама.\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Обавезни аргументи дугих опција су обавезни и за кратке опције.\n"
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "Путања до улазне датотеке:\n"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  УЛАЗНА-ДАТОТЕКА             улазна PO датотека\n"
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -889,31 +902,31 @@ msgstr ""
 "  -D, --directory=ДИР         додај ДИР у списак за тражење улазних "
 "датотека\n"
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Уколико није дата улазна датотека или је „-“, чита се стандардни улаз.\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "Путања излазне датотеке:\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=ДАТОТЕКА  испиши излаз у наведену датотеку\n"
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -923,85 +936,85 @@ msgstr ""
 "или\n"
 "ако је она „-“.\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr "Избор поруке:\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            задржи преведене, уклони непреведене поруке\n"
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          задржи непреведене, уклони преведене поруке\n"
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              уклони поруке означене као „нејасне“\n"
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            задржи поруке означене као „нејасне“\n"
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           уклони застареле поруке #~\n"
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         задржи застареле поруке #~\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Баратање особинама:\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             означи све поруке као „нејасне“\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           означи све поруке као не-„нејасне“\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          означи све поруке као застареле\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        означи све поруке као не-застареле\n"
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           означи све поруке као не-„нејасне“\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=ДАТОТЕКА.po  баратај једино пољима уписаним у ДАТОТЕКА.po\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1009,28 +1022,28 @@ msgstr ""
 "      --ignore-file=ДАТОТЕКА.po  баратај једино пољима која нису у ДАТОТЕКА."
 "po\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 исто што и --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              исто што и --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Синтакса улазне датотеке:\n"
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1038,8 +1051,8 @@ msgstr ""
 "  -P, --properties-input      улазна датотека је у синтакси Јава ."
 "properties\n"
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1049,17 +1062,17 @@ msgstr ""
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "Детаљи излаза:\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1067,9 +1080,9 @@ msgstr ""
 "  -e, --no-escape             не користи C истицање у излазу "
 "(подразумевано)\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1077,28 +1090,28 @@ msgstr ""
 "  -E, --escape                користи C истицање у излазу, без проширених \n"
 "                              знакова\n"
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              испиши ПО датотеку чак и ако је празна\n"
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                испиши ПО датотеку користећи стил увлачења\n"
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           не исписуј редове „#: датотека:ред“\n"
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1106,8 +1119,8 @@ msgstr ""
 "  -n, --add-location          образуј редове „#: датотека:"
 "ред“ (подразумевано)\n"
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1115,32 +1128,32 @@ msgstr ""
 "      --strict                испиши ПО датотеку строго сагласну са "
 "Унифорумом\n"
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     испиши Јава .properties датотеку\n"
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    испиши NeXTstep/GNUstep .strings датотеку\n"
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=БРОЈ            постави ширину излазне странице\n"
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1150,31 +1163,31 @@ msgstr ""
 "ширине \n"
 "                              излазне странице, у више редова\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           образуј поређани излаз\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          поређај излаз по положају у датотеци\n"
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "дат је немогућ критеријум избора (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Употреба: %s [ОПЦИЈА] [УЛАЗНА-ДАТОТЕКА]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1196,24 +1209,24 @@ msgstr ""
 "осим ако се користи --use-first, када се узимају из прве ПО датотеке \n"
 "која их дефинише. Положаји у датотекама из свих ПО датотека се гомилају.\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  УЛАЗНА-ДАТОТЕКА ...         улазне датотеке\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=ДАТОТЕКА   преузми списак улазних датотека из ДАТОТЕКА\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Уколико је улазна датотека „-“, чита се стандардни улаз.\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1222,7 +1235,7 @@ msgstr ""
 "  -<, --less-than=БРОЈ        испиши поруке са мање од оволико дефиниција,\n"
 "                              уобичајено је бесконачно ако није постављено\n"
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1231,7 +1244,7 @@ msgstr ""
 "  -<, --more-than=БРОЈ        испиши поруке са више од оволико дефиниција,\n"
 "                              уобичајено је 0 ако није постављено\n"
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1240,7 +1253,7 @@ msgstr ""
 "  -u, --unique                скраћено за --less-than=2, захтева да\n"
 "                              се испишу једино јединствене поруке\n"
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
@@ -1249,7 +1262,7 @@ msgstr ""
 "  -P, --properties-input      улазне датотеке користе синтаксу за Јава ."
 "properties\n"
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1260,12 +1273,12 @@ msgstr ""
 "GNUstep \n"
 "                              .strings датотеке\n"
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ИМЕ           кодирање за излаз\n"
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1274,27 +1287,41 @@ msgstr ""
 "      --use-first             користи први доступни превод за сваку поруку,\n"
 "                              не спајај више превода\n"
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "нису дате улазне датотеке"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "неопходне су тачно две улазне датотеке"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Употреба: %s [ОПЦИЈА] подр.po реф.pot\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1311,22 +1338,22 @@ msgstr ""
 "превели баш сваку поруку вашег програма.  Када не може да нађе тачно \n"
 "поклапање, користи се нејасно поклапање ради боље дијагностике.\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  подр.po                     преводи\n"
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  реф.pot                     референце на изворне поруке\n"
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Измењивачи рада:\n"
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1334,48 +1361,48 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          примени реф.pot на сваки домен у подр.po\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "  -f, --use-fuzzy             користи нејасне преводе у излазу\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --untranslated          задржи непреведене, уклони преведене поруке\n"
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "упозорење: ова порука се не користи"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "ова порука се користи али није дефинисана..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...али ова дефиниција је слична"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "ова порука се користи али није дефинисана у %s"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "упозорење: ова порука се не користи"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1383,12 +1410,12 @@ msgstr[0] "нађох %d кобну грешку"
 msgstr[1] "нађох %d кобне грешке"
 msgstr[2] "нађох %d кобних грешака"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "обавезно је навести бар две датотеке"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1407,7 +1434,7 @@ msgstr ""
 "извучене примедбе ће се очувати, али само из прве ПО датотеке која их \n"
 "дефинише.  Положаји у датотекама из свих ПО датотека ће се гомилати.\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1416,40 +1443,40 @@ msgstr ""
 "  ->, --more-than=БРОЈ        испиши поруке са више од оволико дефиниција,\n"
 "                              уобичајено је 1 ако није постављено\n"
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           изостави заглавље са пољем „msgid \"\"“\n"
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Претвара каталог превода у друго кодирање знакова.\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Одредиште претварања:\n"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Подразумевано кодирање је кодирање текућег локалитета.\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                стил излаза са увлачењем\n"
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           избаци редове „#: датотека:ред“\n"
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
@@ -1458,28 +1485,28 @@ msgstr ""
 "      --add-location          сачувај редове „#: датотека:"
 "ред“ (подразумевано)\n"
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                строги Унифорум стил исписа\n"
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "није наведена улазна датотека"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr "неопходна је тачно једна улазна датотека"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Употреба: %s [ОПЦИЈА] УЛАЗНА-ДАТОТЕКА\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1492,22 +1519,22 @@ msgstr ""
 "направљена помоћу xgettext-а). Непреведена поља добијају превод \n"
 "идентичан са msgid.\n"
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  УЛАЗНА-ДАТОТЕКА             улазна PO или POT датотека\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr "недостаје име наредбе"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЈА] НАРЕДБА [ОПЦИЈА-НАРЕДБЕ]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1521,7 +1548,7 @@ msgstr ""
 "једном за сваки превод.  Његов излаз постаје улаз msgexec-а.  Повратни\n"
 "код msgexec-а је највећи повратни код кроз све позиве програма.\n"
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1530,42 +1557,42 @@ msgstr ""
 "Нарочита уграђена наредба звана „0“ исписује превод, праћен нула-бајтом.\n"
 "Излаз „msgexec 0“ је погодан као улаз за „xargs -0“.\n"
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=УЛАЗНА-ДАТОТЕКА  улазна ПО датотека\n"
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr "неуспешан упис на стандардни излаз"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "неуспешан упис у подпроцес %s"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr "недостаје име филтера"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "обавезно је навести бар један sed спис"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЈА] ФИЛТЕР [ОПЦИЈЕ-ФИЛТЕРА]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Примењује филтер на све преводе из каталога превода.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1574,18 +1601,18 @@ msgstr ""
 "ФИЛТЕР може бити било који програм који чита превод са стандардног улаза\n"
 "и уписује измењени превод на стандардни излаз.\n"
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Корисне ОПЦИЈЕ-ФИЛТЕРа када је ФИЛТЕР „sed“:\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=СПИС       додај СПИС међу наредбе за извршавање\n"
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1595,14 +1622,14 @@ msgstr ""
 "  -f, --file=ДАТОТЕКА-СПИСА   додај садржај ДАТОТЕКА-СПИСА међу наредбе\n"
 "                              које се извршавају\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       избаци аутоматски испис простора шаблона\n"
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1610,80 +1637,80 @@ msgstr ""
 "      --no-escape             не користи C истицање у излазу "
 "(подразумевано)\n"
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                стил излаза са увлачењем\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           не мењај поље са заглављем, не филтрирај га\n"
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr "Још увек није направљено."
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "не могу да поставим неблокирајући У/И за подпроцес %s"
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "неуспешно споразумевање са подпроцесом %s"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "неуспешно читање из подпроцеса %s"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "подпроцес %s је прекинут уз повратни код %d"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумент за %s треба да буде један интерпункцијски знак"
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "за %s је обавезно навести „-d директоријум“"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "за %s је обавезно навести „-l локалитет“"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s је једино исправно уз %s или %s"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s је једино исправно уз %s, %s или %s"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1691,7 +1718,7 @@ msgstr[0] "%d преведена порука"
 msgstr[1] "%d преведене поруке"
 msgstr[2] "%d преведених порука"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1699,7 +1726,7 @@ msgstr[0] ", %d нејасна порука"
 msgstr[1] ", %d нејасне поруке"
 msgstr[2] ", %d нејасних порука"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1707,17 +1734,17 @@ msgstr[0] ", %d непреведена порука"
 msgstr[1] ", %d непреведене поруке"
 msgstr[2] ", %d непреведених порука"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Употреба: %s [ОПЦИЈА] датотека.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Образуј бинарни каталог порука из текстуалног описа превода.\n"
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1726,17 +1753,17 @@ msgstr ""
 "Обавезни аргументи за дуге опције су обавезни и за кратке опције.\n"
 "Слично за необавезне аргументе.\n"
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  датотека.po ...             улазне датотеке\n"
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режим рада:\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1744,7 +1771,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  Јава режим: образуј Јава класу ResourceBundle\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1753,12 +1780,12 @@ msgstr ""
 "      --java2                 налик --java, и претпостави Јава2 (JDK 1.2 или "
 "новији)\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# режим: образуј .NET .dll датотеку\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1767,40 +1794,40 @@ msgstr ""
 "      --csharp-resources      Режим са C# ресурсима: образује .NET ."
 "resources датотеку\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl режим: образуј tcl/msgcat .msg датотеку\n"
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt режим: образуј Qt .qm датотеку\n"
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                омогући строг Унифорум режим\n"
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Уколико је излазна датотека „-“, испис се врши на стандардни излаз.\n"
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Путања излазне датотеке у Јава режиму:\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       име ресурса\n"
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1808,7 +1835,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=ЛОКАЛИТЕТ      име локалитета, или језик или језик_ДРЖАВА\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -1816,7 +1843,7 @@ msgstr ""
 "  -d ДИРЕКТОРИЈУМ             основни директоријум за хијерархију \n"
 "                              директоријума класе\n"
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1828,12 +1855,12 @@ msgstr ""
 "раздвојено подвлаком.  Опција -d је обавезна.  Класа се уписује под\n"
 "наведеним директоријумом.\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Путања излазне датотеке у C# режиму:\n"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1841,7 +1868,7 @@ msgid ""
 msgstr ""
 "  -d ДИРЕКТОРИЈУМ             основни директоријум за .dll за локалитет\n"
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1850,18 +1877,18 @@ msgstr ""
 "Опције -l и -d су обавезне.  Датотека .dll се уписује у поддиректоријум \n"
 "датог директоријума чије име зависи од локалитета.\n"
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Путања излазне датотеке у Tcl режиму:\n"
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d ДИРЕКТОРИЈУМ             основни директоријум .msg каталога порука\n"
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1869,12 +1896,12 @@ msgid ""
 msgstr ""
 "Опције -l и -d су обавезне.  Датотека .msg се уписује у дати директоријум.\n"
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Обрада улазне датотеке:\n"
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1885,20 +1912,20 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          провери ниске формата у зависности од језика\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          провери присуство и садржај заглавља\n"
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1907,7 +1934,7 @@ msgstr ""
 "      --check-domain          провери сударе међу директивама домена и\n"
 "                                опције --output-file\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1916,7 +1943,7 @@ msgstr ""
 "  -C, --check-compatibility   провери да ли се ГНУ msgfmt понаша као \n"
 "                              X/Open msgfmt\n"
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1927,97 +1954,97 @@ msgstr ""
 "у \n"
 "                                ставкама менија\n"
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             користи нејасне преводе у излазу\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=БРОЈ        поравнај ниске на БРОЈ бајтова (обично: %d)\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               бинарна датотека неће садржати хеш табелу\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            испиши статистичке податке о преводима\n"
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               опширнији испис\n"
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "упозорење: недостаје или је неисправно заглавље PO датотеке\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "упозорење: претварање скупа знакова неће радити\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "упозорење: заглавље PO датотеке је нејасно\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "упозорење: старија издања msgfmt-а ће овде наићи на грешку\n"
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "име домена „%s“ није прикладно за име датотеке"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "име домена „%s“ није прикладно за име датотеке: користићу префикс"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "занемарена директива „domain %s“"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "занемарен унос са празним „msgstr“"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "занемарен нејасан „msgstr“ унос"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: упозорење: изворна датотека садржи нејасне преводе"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при читању „%s“"
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2025,7 +2052,7 @@ msgid ""
 msgstr ""
 "опција „%c“ се не може користити пре него што се наведе „K“, „Т“ или „C“"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2034,7 +2061,7 @@ msgstr ""
 "Извлачи све поруке из каталога превода које одговарају датом шаблону\n"
 "или припадају одређеним изворним датотекама.\n"
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2101,7 +2128,7 @@ msgstr ""
 "  -f, --file=ДАТОТЕКА         преузми ШАБЛОН из ДАТОТЕКА\n"
 "  -i, --ignore-case           занемари разлике величине слова\n"
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2109,18 +2136,18 @@ msgstr ""
 "      --escape                користи C истицање у излазу, без проширених \n"
 "                              знакова\n"
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           образуј поређан излаз\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          поређај излаз према положају у датотеци\n"
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2130,7 +2157,7 @@ msgstr ""
 "окружења LANG, како је описано у датотеци ABOUT-NLS. Ово је\n"
 "неопходно ради испробавања ваших превода.\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2141,12 +2168,12 @@ msgstr ""
 "Наведите локалитет помоћу опције --locale или \n"
 "излазну ПО датотеку помоћу опције --output-file.\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "Направих %s.\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2155,12 +2182,12 @@ msgstr ""
 "Образујем нову ПО датотеку, постављајући мета податке помоћу вредности из \n"
 "окружења корисника.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=УЛАЗНА-ДАТОТЕКА  улазна ПОТ датотека\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2170,12 +2197,12 @@ msgstr ""
 "Уколико није дата улазна датотека, тражићу ПОТ датотеку у текућем \n"
 "директоријуму. Уколико је „-“, читам стандардни улаз.\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=ДАТОТЕКА  испиши излаз у наведену ПО датотеку\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2185,19 +2212,19 @@ msgstr ""
 "подешавања корисниковог локалитета. Ако је „-“, резултат исписујем на\n"
 "стандардни излаз.\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=ЈЈ_ДД          постави одредишни локалитет\n"
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         претпостави да је ПО датотека самоизграђена\n"
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2205,12 +2232,12 @@ msgstr ""
 "Нађох више од једне .pot датотеке.\n"
 "Наведите улазну .pot датотеку помоћу опције --input.\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "грешка при читању текућег директоријума"
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2218,14 +2245,14 @@ msgstr ""
 "Не нађох .pot датотеку у текућем директоријуму.\n"
 "Наведите улазну .pot датотеку помоћу опције --input.\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "неуспешан подпроцес %s са повратним кодом %d"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2241,28 +2268,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "енглески преводи за пакет %s"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "присутни скуп знакова „%s“ не чини име преносивог кодирања"
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "два различита скупа знакова „%s“ и „%s“ у улазној датотеци"
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "улазна датотека „%s“ не садржи поље заглавља са ознаком скупа знакова"
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2271,19 +2298,19 @@ msgstr ""
 "домен „%s“ у улазној датотеци „%s“ не садржи поље заглавља са ознаком скупа "
 "знакова"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "одредишни скуп знакова „%s“ није преносиво име за кодирање."
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "упозорење: "
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2292,7 +2319,7 @@ msgstr ""
 "Улазне датотеке садрже поруке у разним кодирањима, између осталих и УТФ-8.\n"
 "Претварам излаз у УТФ-8.\n"
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2305,7 +2332,7 @@ msgstr ""
 "Претварам излаз у УТФ-8.\n"
 "Да изаберете другачије кодирање излаза, користите опцију --to-code.\n"
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2314,7 +2341,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2327,12 +2354,12 @@ msgstr ""
 "Излаз „%s“-а може бити нетачан.\n"
 "Могућа решења су:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Поставите LC_ALL на локалитет са кодирањем %s.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2343,7 +2370,7 @@ msgstr ""
 "  затим примените „%s“,\n"
 "  а онда претворите назад у %s помоћу „msgconv“.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2356,7 +2383,7 @@ msgstr ""
 "  затим примените „%s“,\n"
 "  и онда претворите назад у %s помоћу „msgconv“.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2367,64 +2394,64 @@ msgstr ""
 "Излаз из „%s“-а може бити нетачан.\n"
 "Могуће решење је да поставите LC_ALL=C.\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "израз за множине може дати негативне вредности"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu али израз за множине може дати чак и вредности %lu"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "израз за множине може проузроковати дељење нулом"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "израз за множине може проузроковати прекорачење опсега целих бројева"
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 "израз за множине може проузроковати аритметичке изузетке, нпр. дељење нулом"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Покушајте да користите следеће, исправно за %s:\n"
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "каталог порука садржи преводе облика за множину..."
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...али у заглављу недостаје поље „plural=ИЗРАЗ“"
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...али у заглављу недостаје поље „nplurals=БРОЈ“"
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "недозвољена вредност за nplurals"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "недозвољен израз за plural"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2432,7 +2459,7 @@ msgstr[0] "али неке поруке имају само један обли
 msgstr[1] "али неке поруке имају само %lu облика за множину"
 msgstr[2] "али неке поруке имају само %lu облика за множину"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2440,7 +2467,7 @@ msgstr[0] "али неке поруке имају један облик за м
 msgstr[1] "али неке поруке имају %lu облика за множину"
 msgstr[2] "али неке поруке имају %lu облика за множину"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2448,81 +2475,81 @@ msgstr ""
 "каталог порука садржи преводе облика множине, али нема поља заглавља „Plural-"
 "Forms: nplurals=БРОЈ; plural=ИЗРАЗ;“"
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "не почиње и „msgid“ и „msgid_plural“ са „\\n“"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "не почиње и „msgid“ и „msgstr[%u]“ са „\\n“"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "не почиње и „msgid“ и „msgstr“ са „\\n“"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "не завршава се и „msgid“ и „msgid_plural“ са „\\n“"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "не завршава се и „msgid“ и „msgstr[%u]“ са „\\n“"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "не завршава се и „msgid“ и „msgstr“ са „\\n“"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "баратање множинама је Гнуово проширење gettext-а"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "У msgstr недостаје ознака пречице са тастатуре „%c“"
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "У msgstr има превише ознака пречица са тастатуре „%c“"
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "недостаје поље „%s“ у заглављу\n"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "поље „%s“ у заглављу треба да почне на почетку реда\n"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "нека поља заглавља и даље садрже почетне подразумеване вредности\n"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "поља „%s“ и даље садржи почетну подразумевану вредност\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "грешка приликом отварања „%s“ за читање"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "улазна датотека не садржи поље заглавља са ознаком скупа знакова"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2531,7 +2558,7 @@ msgstr ""
 "Не могу да претворим из „%s“ у „%s“. %s се ослања на iconv(), а iconv() не "
 "подржава ово претварање."
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2540,8 +2567,8 @@ msgstr ""
 "Претварање из „%s“ у „%s“ уводи понављања: неки различити msgid-ови постају "
 "једнаки."
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2677,17 +2704,17 @@ msgstr ""
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       искључи обавештавање о напретку\n"
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ова порука треба да дефинише облике множине"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "ова порука не треба да дефинише облике множине"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2696,26 +2723,26 @@ msgstr ""
 "%sПрочитах %ld старих + %ld референтних, спојих %ld, нејасних %ld, недостаје "
 "%ld, превазиђених %ld.\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " готово.\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s и изричито име датотеке су међу собом искључиви"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Употреба: %s [ОПЦИЈА] [ДАТОТЕКА]...\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Претвори бинарни каталог порука у .po датотеку Унифорум стила.\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2723,12 +2750,12 @@ msgid ""
 msgstr ""
 "  -j, --java                  Јава режим: улаз је Јава класа ResourceBundle\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# режим: улаз је .NET .dll датотека\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2737,24 +2764,24 @@ msgstr ""
 "      --csharp-resources      Режим за C# ресурсе: улаз је .NET .resources "
 "датотека\n"
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl режим: улаз је tcl/msgcat .msg датотека\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  ДАТОТЕКА ...                улазне .mo датотеке\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Путања улазне датотеке у Јава режиму:\n"
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2764,12 +2791,12 @@ msgstr ""
 "Име класе се одређујем надодавањем имена локалитета на име ресурса, \n"
 "раздвојено подвлаком. Класа се проналази помоћу CLASSPATH.\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Путања улазне датотеке у C# режиму:\n"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2778,12 +2805,12 @@ msgstr ""
 "Опције -l и -d су обавезне.  Датотека .dll се налази у поддиректоријуму \n"
 "датог директоријума чије име зависи од локалитета.\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Путања улазне датотеке у Tcl режиму:\n"
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2791,17 +2818,17 @@ msgid ""
 msgstr ""
 "Опције -l и -d су обавезне.  Датотека .msg се налази у датом директоријуму.\n"
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                стил исписа са увлачењем\n"
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                испис у строгом стилу унифорума\n"
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2822,12 +2849,12 @@ msgstr ""
 "Положаји у датотеци ће се такође гомилати. Када се користи опција --unique,\n"
 "поновљени преводи се занемарују.\n"
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              испиши само поновљене\n"
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2836,12 +2863,12 @@ msgstr ""
 "  -u, --unique                испиши само јединствене поруке, занемари "
 "поновљене\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr "<стдул>"
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2850,7 +2877,7 @@ msgstr ""
 "Скуп знакова „%s“ не чини преносно име кодирања.\n"
 "Претварање порука у скуп знакова корисника можда неће радити.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2859,7 +2886,7 @@ msgstr ""
 "Скуп знакова „%s“ није подржан. %s се ослања на iconv(),\n"
 "а iconv() не подржава „%s“.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2867,15 +2894,15 @@ msgstr ""
 "Инсталирање Гнуовог libiconv-а и затим поновно инсталирање Гнуовог\n"
 "gettext-а ће средити овај проблем.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Ипак настављам, очекујте грешке при рашчлањивању."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Ипак настављам."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2884,7 +2911,7 @@ msgstr ""
 "Скуп знакова „%s“ није подржан. %s се ослања на iconv().\n"
 "Ово издање је изграђено без iconv()-а.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2892,152 +2919,152 @@ msgstr ""
 "Недостаје скуп знакова у заглављу.\n"
 "Претварање порука у скуп знакова корисника неће радити.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "недоследна употреба #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "недостаје одељак „msgstr[]“"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "недостаје одељак „msgid_plural“"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "недостаје одељак „msgstr“"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "први облик множине користи не-нула индекс"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "облик множине има погрешан индекс"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "превише грешака, одустајем"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "неисправан вишебајтни низ"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "недовршен вишебајтни низ на крају датотеке"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "недовршен вишебајтни низ на крају реда"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr "неуспех iconv-а"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "непозната кључна реч „%s“"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "неисправан контролни низ"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "крај датотеке унутар ниске"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "крај реда унутар ниске"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ова датотека не сме садржати директиве за домен"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "двострука дефиниција поруке"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...ово је положај прве дефиниције"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "датотека „%s“ је одсечена"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "датотека „%s“ садржи ниску која се не завршава NUL-ом"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "датотека „%s“ није у Гнуовом .mo облику"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "датотека „%s“ садржи ниску која се не завршава NUL-ом, на %s"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%lu: упозорење: неисправна синтакса \\uxxxx за Уникод знак"
 
 # bug: there are similar messages with "%s:%lu: warning:"
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: упозорење: неокончана ниска"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s:%lu: упозорење: грешка у синтакси"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%lu: упозорење: неокончан пар кључ/вредност"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%lu: упозорење: грешка у синтакси, очекивао сам „;“ након ниске"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
 "%s:%lu: упозорење: грешка у синтакси, очекивао сам „=“ или „;“ након ниске"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "Написа %s.\n"
@@ -3046,43 +3073,43 @@ msgstr "Написа %s.\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "грешка приликом отварања „%s“ за читање"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr "очекивах два аргумента"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Употреба: %s [ОПЦИЈА] АДРЕСА ДАТОТЕКА\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3091,12 +3118,12 @@ msgstr ""
 "Преузимам и исписујем садржај адресе. Уколико не могу да приступим адреси,\n"
 "користи се локално доступна ДАТОТЕКА уместо ње.\n"
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr "грешка при писању на стандардни излаз"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3105,7 +3132,7 @@ msgstr ""
 "Не могу да испишем више домена превода у једну датотеку према синтакси Јава ."
 "properties датотека. Користите PO синтаксу уместо тога."
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3114,7 +3141,7 @@ msgstr ""
 "Не могу да испишем више домена превода у једну датотеку према синтакси "
 "NeXTstep/GNUstep .strings датотека."
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
@@ -3123,7 +3150,7 @@ msgstr ""
 "каталог порука садржи преводе са облицима множине, али излазни облик их не "
 "подржава."
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3133,7 +3160,7 @@ msgstr ""
 "подржава. Покушајте да образујете Јава класу помоћу „msgfmt --java“ уместо "
 "датотеке са особинама (.properties)."
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3141,68 +3168,61 @@ msgstr ""
 "каталог порука садржи преводе са облицима множине, али излазни облик их не "
 "подржава."
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "не могу да направим излазну датотеку „%s“"
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "стандардни излаз"
 
-#: src/write-csharp.c:618
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"каталог порука садржи преводе облика множине\n"
-"али облик Qt каталога порука не подржава баратање множинама\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "не могу да направим „%s“"
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, fuzzy, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
 
-#: src/write-java.c:920
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
 msgstr ""
-"каталог порука садржи преводе облика множине\n"
-"али облик Qt каталога порука не подржава баратање множинама\n"
+"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "није исправно име Јава класе: %s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "грешка при отварању датотеке „%s“ ради уписа"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "интернационализоване поруке не треба да садрже „\\%c“ низове истицања"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3215,7 +3235,7 @@ msgstr ""
 "другачије од вашег. Пробајте да користите АКСРИ msgid.\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3228,7 +3248,7 @@ msgstr ""
 "другачије од вашег. Пробајте да користите АКСРИ msgid.\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3236,7 +3256,7 @@ msgstr ""
 "каталог порука садржи преводе облика множине\n"
 "али облик Qt каталога порука не подржава баратање множинама\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 #, fuzzy
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
@@ -3248,7 +3268,7 @@ msgstr ""
 "а облик Qt каталога порука подржава Уникод једино у преведним нискама,\n"
 "не у непреведним нискама\n"
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3258,12 +3278,12 @@ msgstr ""
 "а облик Qt каталога порука подржава Уникод једино у преведним нискама,\n"
 "не у непреведним нискама\n"
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
 msgstr "грешка при писању датотеке „%s“"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3272,7 +3292,7 @@ msgstr ""
 "каталог порука садржи преводе облика множине\n"
 "али облик Qt каталога порука не подржава баратање множинама\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
@@ -3281,7 +3301,7 @@ msgstr ""
 "каталог порука садржи преводе облика множине\n"
 "али облик Qt каталога порука не подржава баратање множинама\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3290,7 +3310,7 @@ msgstr ""
 "каталог порука садржи преводе облика множине\n"
 "али облик Tcl каталога порука не подржава баратање множинама\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3299,27 +3319,27 @@ msgstr ""
 "али облик Tcl каталога порука не подржава баратање множинама\n"
 
 # bug: there are similar messages with "%s:%lu: warning:"
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: упозорење: неокончана ниска"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: упозорење: неокончан регуларни израз"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: упозорење: неокончана знаковна константа"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: упозорење: неокончана дословна ниска"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3328,7 +3348,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3337,7 +3357,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3346,7 +3366,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3355,7 +3375,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3364,12 +3384,12 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "неуспех iconv-а"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3378,33 +3398,33 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: упозорење: неисправан Уникод знак"
 
 # bug: there are similar messages with "%s:%lu: warning:"
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: упозорење: неокончана константна ниска"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: упозорење: нађох „)“ где очекивах „}“"
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: упозорење: нађох „}“ где очекивах „)“"
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3413,43 +3433,49 @@ msgstr ""
 "Језик „glade“ није подржан. %s се ослања на expat-у.\n"
 "Ово издање је изграђено без expat-а.\n"
 
+# bug: there are similar messages with "%s:%lu: warning:"
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: упозорење: неокончана ниска"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: не могу да нађем окончање ниске „%s“ било где пре краја датотеке"
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: недостаје десна заграда у \\x{ХЕКСАДЕКАДНИ-БРОЈ}"
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправна интерполација („\\l“) 8-битног знака „%c“"
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправна интерполација („\\u“) 8-битног знака „%c“"
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: неисправно вредновање променљивих на „%c“"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправна интерполација („\\L“) 8-битног знака „%c“"
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправна интерполација („\\U“) 8-битног знака „%c“"
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, fuzzy, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3459,7 +3485,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3469,7 +3495,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3479,7 +3505,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3489,7 +3515,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3499,7 +3525,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3509,27 +3535,27 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неисправна дефиниција ниске"
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: недостаје број након #"
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неисправна ниска са изразом"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3538,29 +3564,29 @@ msgstr ""
 "%s:%lu: упозорење: синтакса $\"...\" је превазиђена из безбедносних разлога; "
 "уместо тога користите eval_gettext"
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing се не може користити када се излаз исписује на стандардни "
 "излаз"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може да ради без кључних речи које тражи"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "упозорење: екстензија „%2$s“ датотеке „%1$s“ је непозната; пробаћу C"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Извуци преводиве ниске из датих улазних датотека.\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3568,12 +3594,12 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=ИМЕ    користи ИМЕ.po за излаз (уместо messages.po)\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=ДАТОТЕКА       испиши излаз у наведену датотеку\n"
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3581,12 +3607,12 @@ msgstr ""
 "  -p, --output-dir=ДИР        излазне датотеке се смештају у директоријум "
 "ДИР\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Избор језика улазне датотеке:\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3605,19 +3631,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-извор, NXStringTable, RST, Глејд)\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   пречица за --language=C++\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Подразумева се погађање језика на основу проширења имена датотеке.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3626,22 +3652,22 @@ msgstr ""
 "      --from-code=ИМЕ         кодирање улазних датотека\n"
 "                                (осим за Питон, Tcl, Глејд)\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Подразумева се да су улазне датотеке у АСКРИ запису.\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         споји поруке са постојећом датотеком\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=ДАТОТЕКА.po поља из ДАТОТЕКА.po се не извлаче\n"
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3652,17 +3678,17 @@ msgstr ""
 "излазној \n"
 "                              датотеци\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Посебне опције за језик:\n"
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           извуци све ниске\n"
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3674,7 +3700,7 @@ msgstr ""
 "                                Питон, Лисп, ЕмаксЛисп, librep, Јава, C#,\n"
 "                                awk, Tcl, Перл, PHP, GCC-извор, Глејд)\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3685,7 +3711,7 @@ msgstr ""
 "                              РЕЧ означава употребу подразумеваних кључних \n"
 "                              речи)\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3696,7 +3722,7 @@ msgstr ""
 "бројем \n"
 "                              АРГ кључне речи РЕЧ\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3708,50 +3734,55 @@ msgstr ""
 "                                Питон, Лисп, ЕмаксЛисп, librep, Јава, C#,\n"
 "                                awk, YCP, Tcl, Перл, PHP, GCC-извор)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             разумевање АНСИ C триграфа за улаз\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (једино језици C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (једино језик C++)\n"
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    препознај Qt ниске формата\n"
+
+#: src/xgettext.c:863
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 детаљнији резултат препознавања ниске формата\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     испиши Јава .properties датотеку\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=НИСКА   постави носиоца ауторских права у излазу\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3759,7 +3790,18 @@ msgstr ""
 "      --foreign-user          избаци FSF ауторска права у излазу за стране \n"
 "                              кориснике\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+"      --copyright-holder=НИСКА   постави носиоца ауторских права у излазу\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3767,7 +3809,7 @@ msgstr ""
 "      --msgid-bugs-address=АДРЕСА@Е-ПОШТЕ  постави адресу за пријављивање \n"
 "                                           грешака у msgid-има\n"
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3775,7 +3817,7 @@ msgid ""
 msgstr ""
 "  -m, --msgstr-prefix[=НИСКА]   користи НИСКА или „“ за префикс msgstr поља\n"
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3783,7 +3825,7 @@ msgid ""
 msgstr ""
 "  -M, --msgstr-suffix[=НИСКА]   користи НИСКА или „“ за суфикс msgstr поља\n"
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3792,16 +3834,16 @@ msgstr ""
 "A --flag аргумент не користи синтаксу <кључна-реч>:<брарг>:[пролаз-]"
 "<ознака>: %s"
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "стандардни улаз"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: упозорење: "
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3810,7 +3852,7 @@ msgstr ""
 "Иако се користи на месту ниске формата, %s не представља исправну ниску "
 "формата %s. Разлог: %s\n"
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3819,7 +3861,7 @@ msgstr ""
 "Иако је објављена као таква, %s не представља исправну ниску формата %s. "
 "Разлог: %s\n"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3828,7 +3870,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3838,27 +3880,27 @@ msgstr ""
 "gettext(\"\") враћа поље заглавља са мета-подацима, а не \n"
 "празну ниску.\n"
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3870,15 +3912,46 @@ msgstr ""
 "променљиву MSGID_BUGS_ADDRESS; иначе, наведите опцију\n"
 "--msgid-bugs-address у наредби.\n"
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "језик „%s“ није познат"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
 
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Вишеструко позивање %%%c."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Сва права задржана © %s Free Software Foundation, Inc.\n"
+#~ "Ово је слободан софтвер; погледајте изворни код за услове умножавања. "
+#~ "НЕМА\n"
+#~ "гаранције; чак ни за употребљивост или одређену намену.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "каталог порука садржи преводе облика множине\n"
+#~ "али облик Qt каталога порука не подржава баратање множинама\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "каталог порука садржи преводе облика множине\n"
+#~ "али облик Qt каталога порука не подржава баратање множинама\n"
+
 #~ msgid "Which is your email address?"
 #~ msgstr "Која је ваша е-адреса?"
 
diff --git a/gettext-tools/po/sv.po b/gettext-tools/po/sv.po
index 65cb37781..c3e67975a 100644
--- a/gettext-tools/po/sv.po
+++ b/gettext-tools/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-23 09:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-10-17 15:23+0200\n"
 "Last-Translator: Jan Djärv \n"
 "Language-Team: Swedish \n"
diff --git a/gettext-tools/po/tr.po b/gettext-tools/po/tr.po
index 79a2c6788..5ddc02b6d 100644
--- a/gettext-tools/po/tr.po
+++ b/gettext-tools/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-05-15 02:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-07-09 09:21+0300\n"
 "Last-Translator: Nilgün Belma Bugüner \n"
 "Language-Team: Turkish \n"
@@ -16,88 +16,88 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "argüman %s, %s için geçersiz"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "argüman %s, %s için belirsiz"
 
-#: gnulib-lib/argmatch.c:154
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Geçerli argümanlar:"
 
-#: gnulib-lib/clean-temp.c:334
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "geçici dizin bulunamadı, $TMPDIR ortam değişkeniyle belirtmeyi deneyin"
 
-#: gnulib-lib/clean-temp.c:348
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "\"%s\" şablonu kullanılarak bir geçici dizin oluşturulamaz"
 
-#: gnulib-lib/clean-temp.c:444
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "geçici dosya %s silinemiyor"
 
-#: gnulib-lib/clean-temp.c:459
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "geçici dizin %s silinemiyor"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "yazma hatası"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:55 src/msggrep.c:245
-#: src/open-catalog.c:122 src/read-mo.c:253 src/read-tcl.c:125
-#: src/urlget.c:201 src/xgettext.c:1750 src/xgettext.c:1763
-#: src/xgettext.c:1773
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" okunmak için açılırken hata"
 
-#: gnulib-lib/copy-file.c:74
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "\"%s\" yedek dosyası yazılmak için açılırken hata"
 
-#: gnulib-lib/copy-file.c:82 src/urlget.c:213
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:92
-#: gnulib-lib/copy-file.c:131
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "\"%s\" yazılırken hata"
 
-#: gnulib-lib/copy-file.c:94 gnulib-lib/copy-file.c:133 src/urlget.c:223
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "\"%s\" okunduktan sonra hata"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:840
-#: src/msginit.c:908 src/msginit.c:1068 src/msginit.c:1151
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() başarısız"
 
-#: gnulib-lib/csharpcomp.c:540
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C# derleyici bulunamadı, pnet kurmayı deneyin"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# sanal makinası bulunamadı, pnet kurmayı deneyin"
@@ -106,122 +106,122 @@ msgstr "C# sanal makinası bulunamadı, pnet kurmayı deneyin"
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
-#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:261 gnulib-lib/execute.c:303
-#: gnulib-lib/pipe.c:230 gnulib-lib/pipe.c:348 gnulib-lib/pipe.c:408
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s alt süreci başarısız"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: `--%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: kuraldışı seçenek -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: seçenek için bir argüman gerekli -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n"
 
-#: gnulib-lib/javacomp.c:128 gnulib-lib/javacomp.c:142
-#: gnulib-lib/javacomp.c:158
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class'ın source_version argümanı geçersiz"
 
-#: gnulib-lib/javacomp.c:173 gnulib-lib/javacomp.c:194
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class'ın target_version argümanı geçersiz"
 
-#: gnulib-lib/javacomp.c:505 src/write-csharp.c:714 src/write-java.c:988
-#: src/write-java.c:1000
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" oluşturulamadı"
 
-#: gnulib-lib/javacomp.c:512 src/write-catalog.c:254 src/write-catalog.c:318
-#: src/write-csharp.c:723 src/write-java.c:1009 src/write-mo.c:812
-#: src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" dosyasına yazarken hata"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Java derleyici bulunamadı, ya gcj kurun ya da $JAVAC değişkenini belirleyin"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Java sanal makinası bulunamadı,\n"
 "ya gij kurun ya da $JAVA değişkenini belirleyin"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:848 src/msginit.c:916
-#: src/msginit.c:1076
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s alt süreci G/Ç hatası"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:39 src/msgl-check.c:452 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:436 libgettextpo/gettext-po.c:1245
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: gnulib-lib/pipe.c:156 gnulib-lib/pipe.c:159 gnulib-lib/pipe.c:263
-#: gnulib-lib/pipe.c:266
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "veriyolu oluşturulamıyor"
@@ -245,73 +245,73 @@ msgstr "veriyolu oluşturulamıyor"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:230
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandle 0x%08x hata kodu vererek başarısız oldu"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle başarısız oldu"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s alt süreci"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s alt süreci ölümcül sinyal %d aldı"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr "'%s', 'msgid' gibi geçerli bir %s biçem dizgesi değil. Sebebi: %s"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:624 src/format-librep.c:313
-#: src/format-pascal.c:402 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:138 src/format-tcl.c:391 src/format-ycp.c:145
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr ""
 "'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
 
-#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:634 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
-#: src/format-qt.c:137 src/format-tcl.c:401 src/format-ycp.c:144
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "%u. argüman için '%s' içinde bir biçem belirteci yok"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:911
-#: src/format-elisp.c:379 src/format-gcc-internal.c:654
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
-#: src/format-php.c:381 src/format-python.c:511 src/format-tcl.c:421
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri %u için aynı değil"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "%u numaralı yönerge | ile başlıyor ama | ile bitmiyor."
 
-#: src/format-c.c:182
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -321,107 +321,114 @@ msgstr ""
 "makronun ismi ile aynı değil. Geçerli makro isimleri ISO C 99 bölüm 7.8.1'de "
 "listelenmiştir."
 
-#: src/format-c.c:589
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "%u numaralı yönergede, '<' işaretinden sonraki dizgecikten sonra '>' "
 "gelmiyor."
 
-#: src/format-c.c:815
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Dizge %u numaralı argümana karşılık değil, %u numaralı argüman yok sayılıyor."
 
-#: src/format-c.c:902 src/format-csharp.c:207 src/format-python.c:502
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri farklı sayıda"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 "%u numaralı yönergede, '{' ayracından sonra bir argüman numarası gelmiyor."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "%u numaralı yönergede, ',' ayracından sonra bir sayı gelmiyor."
 
-#: src/format-csharp.c:131 src/format-java.c:192
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 "Dizge yönergenin ortasında bitiyor: Eşleşmeyen '{' ve '}' ayraçları bulundu."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 "%u numaralı yönerge '}' ile değil, geçersiz '%c' karakteri ile bitiyor."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "%u numaralı yönerge '}' ile değil, geçersiz bir karakterle bitiyor."
 
-#: src/format-csharp.c:162 src/format-java.c:347
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 "Dizge yönergenin ortasında başlıyor: eşleşmeyen '}' ve '{' ayraçları bulundu."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Dizge, %u yönerge numarasının hemen ardından gelen bir '}' içeriyor."
 
-#: src/format-gcc-internal.c:254
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "%u numaralı yönergede seçeneklerin birleşimi geçersiz"
 
-#: src/format-gcc-internal.c:291 src/format-gcc-internal.c:397
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "%u numaralı yönergede, '%c' den önce bir hassasiyet olmamalı."
 
-#: src/format-gcc-internal.c:333
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "%u numaralı yönergede, hassaiyet için argüman numarası %u olmalı."
 
-#: src/format-gcc-internal.c:405
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "%u numaralı yönergede, '%c' den önce bir hassasiyet olmamalı."
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "%u numaralı yönergede, hassasiyet belirtimi geçersiz."
 
-#: src/format-gcc-internal.c:460
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "%u numaralı yönergede, \"%c\" den önce imler olmamalı."
 
-#: src/format-gcc-internal.c:672
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "'msgid' %%m kullanırken '%s' kullanmıyor"
 
-#: src/format-gcc-internal.c:675
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' %%m kullanmazken '%s' %%m kullanıyor"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Dizge yönergenin ortasında bitiyor."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -429,13 +436,13 @@ msgstr ""
 "Dizge hem mutlak argüman numaralarına hem de numarasız argüman "
 "belirtimlerine karşılık geliyor."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "%u numaralı yönergede, 0 numaralı argüman bir pozitif tamsayı değil."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
@@ -444,7 +451,7 @@ msgstr ""
 "%u numaralı yönergede, width'in 0 numaralı argümanı bir pozitif tamsayı "
 "değil."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
@@ -453,7 +460,7 @@ msgstr ""
 "%u numaralı yönergede, precision'ın 0 numaralı argümanı bir pozitif tamsayı "
 "değil."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
@@ -461,7 +468,7 @@ msgid ""
 msgstr ""
 "%u numaralı yönergede, '%c' karakteri geçerli bir dönüşüm belirteci değil."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -470,12 +477,12 @@ msgstr ""
 "%u numaralı yönergeyi sonlandıran karakter geçerli bir dönüşüm belirteci "
 "değil."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Dizge, %u numaralı argümana uygun olmayan bir yolla karşılık geliyor."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -484,19 +491,19 @@ msgstr ""
 "%u numaralı yönergede, \"%s\" altdizgesi geçerli bir tarih/zaman biçemi "
 "değil."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "%u numaralı yönergede, \"%s\" den sonra virgül gelmiyor."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
 "%u numaralı yönergede, \"%s\" altdizgesi geçerli bir sayı biçemi değil."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -505,12 +512,12 @@ msgstr ""
 "%u numaralı yönergede, argüman numarasından sonra bir virgül ve \"%s\" veya "
 "\"%s\" veya \"%s\" veya \"%s\" gelmeliydi."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "%u numaralı yönergede, bir seçim numara içermiyor."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -519,7 +526,7 @@ msgstr ""
 "%u numaralı yönergede, bir seçim kendisinden sonra '<', '#' veya '%s' "
 "gelmeyen bir numara içeriyor."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -527,19 +534,19 @@ msgid ""
 msgstr ""
 "'%2$s' içindeki {%1$u}. argüman için bir biçem belirteci 'msgid' içinde yok"
 
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "{%u}.argüman için '%s' içinde bir biçem belirteci yok"
 
-#: src/format-java.c:776
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri {%u} için aynı değil"
 
-#: src/format-lisp.c:2338 src/format-lisp.c:2350 src/format-scheme.c:2364
-#: src/format-scheme.c:2376
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -548,7 +555,7 @@ msgstr ""
 "%u numaralı yönergede, %u parametresi '%s' türünde, '%s' türünde bir "
 "parametre bekleniyordu."
 
-#: src/format-lisp.c:2373 src/format-scheme.c:2399
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -563,33 +570,33 @@ msgstr[1] ""
 "%u numaralı yönergede, çok fazla parametre verilmiş; en fazla %u parametre "
 "umuluyordu."
 
-#: src/format-lisp.c:2497 src/format-scheme.c:2500
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "%u numaralı yönergede, '%c' den sonra bir rakam gelmiyor."
 
-#: src/format-lisp.c:2737 src/format-scheme.c:2755
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "%u numaralı yönergede, %d. argüman negatif."
 
-#: src/format-lisp.c:2806
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Dizge, bir ~/.../ yönergesinin ortasında bitiyor."
 
-#: src/format-lisp.c:2844 src/format-lisp.c:3109 src/format-lisp.c:3226
-#: src/format-lisp.c:3286 src/format-lisp.c:3398 src/format-scheme.c:2841
-#: src/format-scheme.c:3106 src/format-scheme.c:3223 src/format-scheme.c:3321
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "'~%2$c' ile eşleşmeyen '~%1$c' bulundu."
 
-#: src/format-lisp.c:2864 src/format-scheme.c:2861
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "%u numaralı yönergede, hem @ hem de : değiştiricileri verilmiş."
 
-#: src/format-lisp.c:2977 src/format-scheme.c:2974
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -598,27 +605,27 @@ msgstr ""
 "%u numaralı yönergede, '~:[' yönergesinden sonra  '~;' ile ayrılmış iki "
 "cümle gelmiyor."
 
-#: src/format-lisp.c:3327 src/format-scheme.c:3264
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "%u numaralı yönergede, '~;' geçersiz bir konumda kullanılmış."
 
-#: src/format-lisp.c:3433 src/format-scheme.c:3356
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "Dizge bazı argümanlara uyumsuz bir yolla karşılık getirilmiş."
 
-#: src/format-lisp.c:3475 src/format-scheme.c:3398
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri aynı değil"
 
-#: src/format-lisp.c:3491 src/format-scheme.c:3414
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr ""
 "'%s' içindeki biçem belirteçleri 'msgid' içindekilerin bir alt kümesi değil"
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -627,12 +634,12 @@ msgstr ""
 "%u numaralı yönergede, boyut belirteci '%c' dönüşüm belirtimi ile uyumlu "
 "değil."
 
-#: src/format-perl-brace.c:200 src/format-python.c:460 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "'%s' için '%s' içinde bir biçem belirteci yok"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -640,12 +647,12 @@ msgstr ""
 "Dizge hem argüman isimlerine hem de numarasız argüman belirtimlerine "
 "karşılık geliyor."
 
-#: src/format-python.c:344
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Dizge '%s' isimli argümana uyumsuz bir yolla karşılık getirilmiş."
 
-#: src/format-python.c:420
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -654,7 +661,7 @@ msgstr ""
 "`msgid' içindeki biçem belirteçleri ile bir eşlem umulurken '%s' "
 "içindekilerle bir işlem umuluyor"
 
-#: src/format-python.c:427
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -663,29 +670,31 @@ msgstr ""
 "`msgid' içindeki biçem belirteçleri ile bir işlem umulurken '%s' "
 "içindekilerle bir eşlem umuluyor"
 
-#: src/format-python.c:450 src/format-sh.c:298
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "'%2$s' içinde '%1$s' için 'msgid' içinde bir biçem belirteci yok"
 
-#: src/format-python.c:480
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "'%2$s' için biçem belirteci 'msgid' ve '%1$s' içinde aynı değil"
 
-#: src/format-qt.c:81
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "%%%c için çoklu başvuru."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Dizge, ASCII olmayan karakter içeren bir kabuk değişkeni."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -693,7 +702,7 @@ msgstr ""
 "Dizge, kabuğun kaşlı ayraç sözdizimli bir kabuk değişkenine karşılık. "
 "Güvenlikle ilgili sebeplerden dolayı bu sözdizimi desteklenmiyor."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
@@ -701,11 +710,11 @@ msgstr ""
 "Dizge, değeri kabuk işlevleri içinde farklı olabilen bir kabuk değişkenine "
 "ait."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Dizge, isimsiz bir kabuk değişkenini gösteriyor."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
@@ -713,7 +722,7 @@ msgid ""
 msgstr ""
 "%u numaralı yönergede, '%c' karakteri 1 ile 9 arasında bir rakam değil."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
@@ -721,27 +730,24 @@ msgid ""
 msgstr ""
 "%u numaralı yönergeyi sonlandıran karakter 1 ile 9 arasında bir rakam değil."
 
-#: src/hostname.c:179 src/msgattrib.c:326 src/msgcat.c:282 src/msgcmp.c:162
-#: src/msgcomm.c:269 src/msgconv.c:224 src/msgen.c:212 src/msgexec.c:179
-#: src/msgfilter.c:281 src/msgfmt.c:365 src/msggrep.c:399 src/msginit.c:258
-#: src/msgmerge.c:320 src/msgunfmt.c:251 src/msguniq.c:248
-#: src/recode-sr-latin.c:111 src/urlget.c:131 src/xgettext.c:509
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Telif Hakkı (C) %s Free Software Foundation, Inc.\n"
-"Bu bir serbest yazılımdır; kopyalama koşulları için kaynak koduna bakınız.\n"
-"Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
-"UYGUNLUĞU için bile garanti verilmez.\n"
 
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
 #: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:263
-#: src/msgmerge.c:325 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:514
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s tarafından yazıldı.\n"
@@ -749,26 +755,26 @@ msgstr "%s tarafından yazıldı.\n"
 #. This is a proper name. See the gettext manual, section Names.
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
 #: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:263 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
 #: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:273 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
 #: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
 #: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:347
-#: src/msgmerge.c:446 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:730
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n"
 
-#: src/hostname.c:211 src/msginit.c:351 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK]\n"
@@ -805,27 +811,27 @@ msgstr "  -i, --ip-address            konak adresleri\n"
 
 #: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
 #: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:403
-#: src/msgmerge.c:563 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:880
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Bilgilendirme çıktısı:\n"
 
 #: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
 #: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:405
-#: src/msgmerge.c:565 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:882
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  bu yardım iletisini gösterir ve çıkar\n"
 
 #: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
 #: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:407
-#: src/msgmerge.c:567 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:884
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               Sürüm bilgilerini gösterir ve çıkar\n"
@@ -836,9 +842,9 @@ msgstr "  -V, --version               Sürüm bilgilerini gösterir ve çıkar\n
 #. bugs (typically your translation team's web or email address).
 #: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
 #: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:414
-#: src/msgmerge.c:578 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:891
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr ""
 "Yazılım hatalarını  adresine,\n"
@@ -849,8 +855,8 @@ msgstr ""
 msgid "could not get host name"
 msgstr "makina ismi alınamadı"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:151 src/msgfilter.c:211
-#: src/msggrep.c:419 src/msginit.c:196 src/msguniq.c:268
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "en fazla bir girdi dosyasına izin var"
@@ -859,9 +865,10 @@ msgstr "en fazla bir girdi dosyasına izin var"
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
 #: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
 #: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:350 src/msgmerge.c:371
-#: src/msgmerge.c:375 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:524 src/xgettext.c:528 src/xgettext.c:535
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ile %s bağdaşmıyor"
@@ -882,7 +889,7 @@ msgstr ""
 
 #: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
 #: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:361 src/msgmerge.c:467 src/msgunfmt.c:423
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
@@ -892,8 +899,8 @@ msgstr ""
 
 #: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
 #: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:364 src/msgmerge.c:470
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:748
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "Girdi dosyasının yeri:\n"
@@ -905,8 +912,8 @@ msgstr "  GİRDİDOSYASI                girdi olan PO dosyası\n"
 
 #: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
 #: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:476 src/msguniq.c:336
-#: src/xgettext.c:754
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -922,21 +929,21 @@ msgstr "Bir DOSYA verilmemişse ya da - verilmişse standart girdi okunur.\n"
 
 #: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
 #: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:372 src/msgmerge.c:488 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:759
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "Çıktı dosyasının yeri:\n"
 
 #: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
 #: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:490 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=DOSYA     çıktıyı DOSYAya yazar\n"
 
 #: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:492
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -1051,14 +1058,14 @@ msgstr ""
 
 #: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
 #: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:380 src/msgmerge.c:525
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Girdi dosyası sözdizimi:\n"
 
 #: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:382 src/msguniq.c:358
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1067,7 +1074,7 @@ msgstr ""
 "sözdizimindedir\n"
 
 #: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:384 src/msguniq.c:360
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1078,15 +1085,15 @@ msgstr ""
 
 #: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
 #: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:387 src/msgmerge.c:533 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:838
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "Çıktı ayrıntıları:\n"
 
 #: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:535 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:840
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1095,8 +1102,8 @@ msgstr ""
 "(öntanımlı)\n"
 
 #: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:537 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:842
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1106,27 +1113,27 @@ msgstr ""
 "                              yorumlanmaz\n"
 
 #: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:539
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:844
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              boş bile olsa PO dosyasını yazar\n"
 
 #: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:846
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                .po dosyasını girintili tarzda yazar\n"
 
 #: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:848
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: dosyaismi:satır' satırları yazılmaz\n"
 
 #: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:850
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1135,7 +1142,7 @@ msgstr ""
 "                              (öntanımlı\n"
 
 #: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:852
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1143,16 +1150,16 @@ msgstr ""
 "      --strict                .po dosyasının bilinen biçeminde yazar.\n"
 
 #: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:393
-#: src/msgmerge.c:549 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output     çıktıyı bir Java .properties dosyasına yazar\n"
 
 #: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:395
-#: src/msgmerge.c:551 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:856
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1161,15 +1168,15 @@ msgstr ""
 "                              dosyasına yazar\n"
 
 #: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:397
-#: src/msgmerge.c:553 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:858
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=SAYI            sayfa genişliğini SAYIya ayarlar\n"
 
 #: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:399
-#: src/msgmerge.c:555 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:860
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1179,15 +1186,15 @@ msgstr ""
 "                              kısmı bir alt satıra indirilmez\n"
 
 #: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:558 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:863
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sıralı çıktı üretir\n"
 
 #: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:560 src/msguniq.c:395
-#: src/xgettext.c:865
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          çıktıyı dosyadaki yerine göre sıralar\n"
@@ -1197,7 +1204,7 @@ msgstr "  -F, --sort-by-file          çıktıyı dosyadaki yerine göre sırala
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "belirtilen seçim kriteri mümkün değil (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:734
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]...\n"
@@ -1226,19 +1233,19 @@ msgstr ""
 "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n"
 "alınır.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:750
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  GİRDİDOSYASI ...            girdi dosyaları\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:752
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=DOSYA      girdi dosyalarının listesi DOSYAdan alınır\n"
 
 #: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:756
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Girdi dosyası - ise, standart girdi okunur.\n"
@@ -1271,7 +1278,7 @@ msgstr ""
 "                              eşi olmayan iletiler basılır\n"
 
 #: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:527
+#: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1280,7 +1287,7 @@ msgstr ""
 "sözdizimlidir\n"
 
 #: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:529
+#: src/msgmerge.c:532
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1318,21 +1325,21 @@ msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:325
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:336
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "hiçbir girdi dosyası verilmemiş"
 
-#: src/msgcmp.c:183 src/msgmerge.c:341
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "tam olarak 2 girdi dosyası gerekli"
 
-#: src/msgcmp.c:202 src/msgmerge.c:450
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Kullanımı: %s [SEÇENEK] def.po ref.pot\n"
@@ -1363,12 +1370,12 @@ msgstr "  def.po                      çeviriler\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     kaynaklara bağlantılar\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:516
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "İşlem değiştiriciler:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:518
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1397,17 +1404,17 @@ msgstr "bu ileti çevrilmemiş"
 msgid "this message needs to be reviewed by the translator"
 msgstr "bu iletiyi çevirmenin gözden geçirmesi lazım"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1220
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "bu ileti kullanıldı ama tanımlı değil..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1223
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ama bu tanımlama benzer"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1251
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "bu ileti kullanıldı ama %s'de tanımlı değil"
@@ -1460,7 +1467,7 @@ msgstr ""
 "  ->, --more-than=SAYI        SAYIdan daha fazla olan iletileri basar,\n"
 "                              verilmezse öntanımlı 1 dir\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:867
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1482,20 +1489,20 @@ msgstr "Dönüşüm hedefi:\n"
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Öntanımlı kodlama mevcut yerelin kodlamasıdır.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:541
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                girintili çıktı tarzı\n"
 
 #: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:543
+#: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: dosyaismi:satır' satırlarını engeller\n"
 
 #: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:545
+#: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1504,12 +1511,12 @@ msgstr ""
 "                              (öntanımlı)\n"
 
 #: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:547
+#: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                çıktı bilinen biçemde yazılır\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:552
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "hiç girdi dosyası verilmemiş"
@@ -1692,18 +1699,18 @@ msgstr "%s alt sürecinden okunamadı"
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı"
 
-#: src/msgfmt.c:303
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s argümanı bir noktalama işareti olmalıydı"
 
-#: src/msgfmt.c:350
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "bayt sırası geçersiz: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:514
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1759,7 +1766,7 @@ msgstr "Kullanımı: %s [SEÇENEK] dosyaismi.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Çevirilerin bulunduğu dosyadan ikilik ileti kataloğunu üretir.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:743
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1773,7 +1780,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  DOSYAİSMİ.po ...            girdi dosyaları\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:482 src/msgunfmt.c:426 src/xgettext.c:791
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "İşlem kipi:\n"
@@ -1829,7 +1836,7 @@ msgstr "      --qt                    Qt kipi: bir Qt .qm dosyası üretir\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                bilinen kip etkinleştirilir\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:767
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Çıktı dosyası - verilmişse, standard çıktı kullanılır.\n"
@@ -1910,7 +1917,7 @@ msgid ""
 msgstr ""
 "-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:783
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Girdi dosyası yorumlaması:\n"
@@ -1993,7 +2000,7 @@ msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            çeviriler hakkındaki istatistikleri basar\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:569 src/msgunfmt.c:515
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               daha ayrıntılı çıktı verilir\n"
@@ -2048,13 +2055,13 @@ msgstr "fuzzy `msgstr' girdisi yoksayıldı"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
 
-#: src/msggrep.c:256 src/po-lex.c:658 src/read-mo.c:87
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:141
-#: src/x-c.c:416 src/x-csharp.c:160 src/x-elisp.c:147 src/x-glade.c:452
-#: src/x-java.c:173 src/x-librep.c:149 src/x-lisp.c:214 src/x-perl.c:228
-#: src/x-perl.c:303 src/x-perl.c:396 src/x-php.c:164 src/x-python.c:176
-#: src/x-rst.c:235 src/x-scheme.c:173 src/x-sh.c:157 src/x-smalltalk.c:93
-#: src/x-tcl.c:152 src/x-ycp.c:93
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
@@ -2174,7 +2181,7 @@ msgstr "      --sort-output           sıralı çıktı üretir\n"
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sıralama dosyanın yerine göre yapılır\n"
 
-#: src/msginit.c:286
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2184,7 +2191,7 @@ msgstr ""
 "değişkenini ABOUT-NLS dosyasında açıklandığı gibi belirtin.\n"
 "Bu çevirinizi test edebilmeniz için gereklidir.\n"
 
-#: src/msginit.c:310
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2195,24 +2202,24 @@ msgstr ""
 "Lütfen --locale seçeneğinden bir yerel ya da\n"
 "--output-file seçeneğinden .po çıktı dosyası belirtin.\n"
 
-#: src/msginit.c:336
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s oluşturuldu.\n"
 
-#: src/msginit.c:356
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "Kullanıcının ortam değişkenlerindeki bilgilerle bir yeni PO dosyası oluşturur.\n"
 
-#: src/msginit.c:366
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=GİRDİDOSYASI    POT dosyası\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2222,12 +2229,12 @@ msgstr ""
 "Girdi dosyası verilmemişse, POT dosyası içinde bulunulan dizinde aranır,\n"
 "- verilmişse standart girdi okunur.\n"
 
-#: src/msginit.c:374
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=DOSYA     çıktı belirtilen PO dosyasına yazılır\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2236,19 +2243,19 @@ msgstr ""
 "Çıktı dosyası verilmemişse, --locale seçeneği ya da kullanıcının yerel\n"
 "ayarları kullanılır, - verilmişse sonuçlar standart çıktıya yazılır.\n"
 
-#: src/msginit.c:389
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=tr_TR          hedef yerel belirtilir\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         PO dosyasının otomatik üretildiği varsayılır\n"
 
-#: src/msginit.c:451
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2257,12 +2264,12 @@ msgstr ""
 "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile "
 "belirtin.\n"
 
-#: src/msginit.c:459 src/msginit.c:464
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "dizin okunurken hata"
 
-#: src/msginit.c:472
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2271,14 +2278,14 @@ msgstr ""
 "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile "
 "belirtin.\n"
 
-#: src/msginit.c:861 src/msginit.c:929 src/msginit.c:1089 src/msginit.c:1168
-#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
-#: src/read-tcl.c:127 src/write-resources.c:104
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s alt süreci çıkış kodu %d ile başarısız"
 
-#: src/msginit.c:1054
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2293,28 +2300,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1443
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s paketi için Türkçe çeviriler"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "mevcut karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "girdi dosyasında iki farklı karakter kümesi: \"%s\" ve \"%s\""
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "girdi dosyası `%s' başlığında bir karakter kümesi belirtilmemiş."
 
-#: src/msgl-cat.c:207
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2323,19 +2330,19 @@ msgstr ""
 "\"%s\" paketi girdi dosyası `%s' başlığındaki charset alanında bir karakter\n"
 "kümesi belirtilmemiş"
 
-#: src/msgl-cat.c:389 src/msgl-iconv.c:361
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "hedef karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil."
 
-#: src/msgl-cat.c:440 src/msgl-cat.c:446 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:2770
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "uyarı: "
 
-#: src/msgl-cat.c:441
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2344,7 +2351,7 @@ msgstr ""
 "Girdi dosyası UTF-8 ile karışık farklı kodlamalar içeriyor.\n"
 "Çıktı UTF-8'e dönüştürülüyor.\n"
 
-#: src/msgl-cat.c:447
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2356,7 +2363,7 @@ msgstr ""
 "Çıktı UTF-8'e çevriliyor.\n"
 "--to-code seçeneğini kullanarak başka bir kodlama da seçebilirsiniz.\n"
 
-#: src/msgl-cat.c:486
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2370,7 +2377,7 @@ msgstr ""
 "dosyalarınızdaki gibi başından itibaren UTF-8 kodlanmış olmalarını "
 "sağlayın.\n"
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2383,12 +2390,12 @@ msgstr ""
 "'%s' çıktısı yanlış olabilir.\n"
 "Yapılabilecekler:\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- LC_ALL değişkenini %s kodlamasını kullanan bir yerele ayarlayın.\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2399,7 +2406,7 @@ msgstr ""
 "  '%s' uyguladıktan sonra,\n"
 "  'msgconv' kullanarak tekrar %s a dönün.\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2412,7 +2419,7 @@ msgstr ""
 "  '%s' uyguladıktan sonra,\n"
 "  'msgconv' kullanarak tekrar %s a dönün.\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2423,75 +2430,75 @@ msgstr ""
 "'%s' çıktısı yanlış olabilir.\n"
 "Tek yapılabilecek LC_ALL=C ayarlamaktır.\n"
 
-#: src/msgl-check.c:91
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "çoğul ifadeler negatif değerler üretebilir"
 
-#: src/msgl-check.c:101
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu ama çoğul ifadeler en çok %lu değer üretebilir"
 
-#: src/msgl-check.c:142
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "çoğul ifade sıfırla bölme hatası üretebilir"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "çoğul ifade tamsayı taşması üretebilir"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 "çoğul ifade aritmetik hatalar, özellikle de sıfırla bölme hatası üretebilir"
 
-#: src/msgl-check.c:184
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Aşağıdakiler %s için geçerli mi diye kullanmayı dene:"
 
-#: src/msgl-check.c:267 src/msgl-check.c:291
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr "ileti kataloğu çoğul çeviriler içeriyor"
 
-#: src/msgl-check.c:269
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ama başlıkta \"plural=İFADE\" gibi bir şey yok"
 
-#: src/msgl-check.c:293
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ama başlıkta \"nplurals=TAMSAYI\" gibi bir şey yok"
 
-#: src/msgl-check.c:329
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "nplurals değeri geçersiz"
 
-#: src/msgl-check.c:351
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "plural= ile verilen ifade geçersiz"
 
-#: src/msgl-check.c:381 src/msgl-check.c:397
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:383
+#: src/msgl-check.c:392
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...ama bazı iletiler tek çoğul biçem içeriyor"
 msgstr[1] "...ama bazı iletiler sadece %lu çoğul biçem içeriyor"
 
-#: src/msgl-check.c:399
+#: src/msgl-check.c:408
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...ama bazı iletiler tek çoğul biçem içeriyor"
 msgstr[1] "...ama bazı iletiler %lu çoğul biçem içeriyor"
 
-#: src/msgl-check.c:419
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2499,82 +2506,82 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen başlıkta\n"
 "\"Plural-Forms: nplurals=TAMSAYI; plural=İFADE;\" gibi bir şey yok."
 
-#: src/msgl-check.c:501
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgl-check.c:509
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgl-check.c:524
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgl-check.c:542
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgl-check.c:550
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgl-check.c:565
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgl-check.c:577
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "çoğul biçemler bir GNU gettext özelliğidir"
 
-#: src/msgl-check.c:619
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "içinde '%c' tuş kısayolu eksik"
 
-#: src/msgl-check.c:629
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "çok fazla '%c' tuş kısayolu içeriyor"
 
-#: src/msgl-check.c:669
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "başlıkta `%s' başlık alanı yok\n"
 
-#: src/msgl-check.c:677
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "`%s' başlık alanı satırın başında olmalıydı\n"
 
-#: src/msgl-check.c:691
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n"
 
-#: src/msgl-check.c:704
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: girdi \"%s\" kodlama için geçersiz"
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: \"%s\" kodlamasından \"%s\" kodlamasına dönüşümde hata"
 
-#: src/msgl-iconv.c:269
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "girdi dosyasının başlığında bir karakter kümesi belirtilmemiş"
 
-#: src/msgl-iconv.c:291 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:618 src/xgettext.c:610
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2583,7 +2590,7 @@ msgstr ""
 "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı,\n"
 "ve iconv() bu dönüşümü desteklemiyor."
 
-#: src/msgl-iconv.c:321
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2592,8 +2599,8 @@ msgstr ""
 " \"%s\" den \"%s\" e dönüşüm tekrarlar oluşturuyor: bazı msgid'ler aynı "
 "oluyor."
 
-#: src/msgl-iconv.c:327 src/recode-sr-latin.c:301 src/x-python.c:625
-#: src/xgettext.c:617
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2602,16 +2609,16 @@ msgstr ""
 "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı.\n"
 "Bu sürüm iconv() olmaksızın kurgulanmış."
 
-#: src/msgmerge.c:358 src/msgmerge.c:364
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s sadece %s ile geçerlidir"
 
-#: src/msgmerge.c:418
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr "yedekleme türü"
 
-#: src/msgmerge.c:455
+#: src/msgmerge.c:458
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2634,17 +2641,17 @@ msgstr ""
 "Daha iyi sonuçlar elde edebilmek için zorunlu eşleşmeler bulunamadığında\n"
 "belirsiz eşleşmeler kullanılmıştır.\n"
 
-#: src/msgmerge.c:472
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      eski kaynaklara bağlı çeviriler\n"
 
-#: src/msgmerge.c:474
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     yeni kaynaklara bağlar\n"
 
-#: src/msgmerge.c:478
+#: src/msgmerge.c:481
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2653,7 +2660,7 @@ msgstr ""
 "  -C, --compendium=DOSYA      ileti çevirileri için ek veritabanı, birden\n"
 "                              fazla belirtilebilir\n"
 
-#: src/msgmerge.c:484
+#: src/msgmerge.c:487
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2662,27 +2669,27 @@ msgstr ""
 "  -U, --update                def.po dosyasını günceller,\n"
 "                              def.po zaten güncelse bir şey yapmaz\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Güncelleme kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgmerge.c:498
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Sonuç gerisin geri def.po'ya yazılır.\n"
 
-#: src/msgmerge.c:500
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        def.po'nun yedeklemesini yapar\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SONEK          yedekleme sonek kullanarak yapılır\n"
 
-#: src/msgmerge.c:504
+#: src/msgmerge.c:507
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2701,7 +2708,7 @@ msgstr ""
 "                              yedekleme yapılır\n"
 "  simple, never               daima basit yedekleme yapılır\n"
 
-#: src/msgmerge.c:511
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2711,34 +2718,34 @@ msgstr ""
 "--suffix seçeneği ile ya da SIMPLE_BACKUP_SUFFIX ortam değişkeni ile\n"
 "belrtilmedikçe yedeklenen dosyanın soneki `~' dir.\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:523
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     fuzzy eşleşmeler kullanılmaz\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:525
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              çevrilmiş iletinin eski msgid'sini tutar\n"
 
-#: src/msgmerge.c:571
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       işlemin ilerleyişi gösterilmez\n"
 
-#: src/msgmerge.c:1324
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr ".bu ileti çoğul biçem olmalıydı"
 
-#: src/msgmerge.c:1347
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "bu ileti çoğul biçem olmamalıydı"
 
-#: src/msgmerge.c:1685
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2747,7 +2754,7 @@ msgstr ""
 "%s%ld eski + %ld referans, %ld katışık, %ld fuzzy, %ld eksik, %ld artık "
 "kullanılmayan ileti okundu.\n"
 
-#: src/msgmerge.c:1693
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " bitti.\n"
 
@@ -2890,12 +2897,12 @@ msgstr ""
 "  -u, --unique                sadece tek iletiler gösterilir,\n"
 "                              tekrarlananlar iptal edilir\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2904,7 +2911,7 @@ msgstr ""
 "\"%s\" karakter kümesi kabul görmüş bir isim değil.\n"
 "Kullanıcının karakter kümesine dönüşüm yapılamıyabilir.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2913,7 +2920,7 @@ msgstr ""
 "\"%s\" karakter kümesi desteklenmiyor. %s iconv()ye bağlı.\n"
 "ve iconv() \"%s\" desteği vermiyor.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2921,15 +2928,15 @@ msgstr ""
 "GNU libiconv paketini kurduktan sonra GNU gettext paketini\n"
 "yeniden kurarak bu sorunun üstesinden gelmelisiniz.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Çözümleme hatalarına rağmen devam ediliyor."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Yine de devam ediliyor."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2938,7 +2945,7 @@ msgstr ""
 "\"%s\" karakter kümesi desteklenmiyor. %s iconv()ye bağlı.\n"
 "Bu sürüm iconv() olmaksızın kurgulanmış.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2946,32 +2953,32 @@ msgstr ""
 "Başlıkta karakter kümesi yok.\n"
 "Kullanıcının karakter kümesinde ileti dönüşümü yapılamayacak.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "#~ kullanımı aykırı"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "`msgstr[]' bölümü yok"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "`msgid_plural' bölümü yok"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "`msgstr' bölümü yok"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "ilk çoğul biçemin indeksi sıfır değil"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "çoğul biçemin indeksi hatalı"
@@ -2981,7 +2988,7 @@ msgstr "çoğul biçemin indeksi hatalı"
 msgid "too many errors, aborting"
 msgstr "hatalar çok fazla, bunları düzeltince programı tekrar çalıştırın"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:708 src/write-po.c:833
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "çoklu bayt dizisi geçersiz"
@@ -3025,61 +3032,61 @@ msgstr "dizge içinde satır sonu"
 msgid "context separator  within string"
 msgstr "dizge içinde  bağlam ayracı"
 
-#: src/read-catalog.c:328 src/xgettext.c:903
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "bu dosya paket yönergelerini içermeyebilir"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "ileti iki defa tanımlanmış"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "bu ilk tanımlamanın konumu"
 
-#: src/read-mo.c:106 src/read-mo.c:127 src/read-mo.c:173 src/read-mo.c:200
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" dosyası kırpılmış"
 
-#: src/read-mo.c:130
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "\"%s\" dosyası NUL sonlandırmalı olmayan bir dizge içeriyor"
 
-#: src/read-mo.c:166 src/read-mo.c:275
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" dosyası bir GNU .mo dosyas değil"
 
-#: src/read-mo.c:179
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
 "\"%s\" dosyası %s. satırda NUL sonlandırmalı olmayan bir dizge içeriyor"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "uyarı: Unicode karakter için \\uxxxx sözdizimi geçersiz"
 
-#: src/read-stringtable.c:803
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "uyarı: sonlandırılmamış dizge"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "uyarı: sözdizimi hatası"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "uyarı: sonlandırılmamış isim/değer çifti"
 
-#: src/read-stringtable.c:940
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr "uyarı: sözdizimi hatası, dizgeden sonra ';' yok"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "uyarı: sözdizimi hatası, dizgeden sonra ';' ya da '=' umuluyor"
 
@@ -3144,7 +3151,7 @@ msgstr ""
 msgid "error writing stdout"
 msgstr "standart çıktıya yazılırken hata"
 
-#: src/write-catalog.c:127
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
@@ -3152,14 +3159,14 @@ msgstr ""
 "Belirtilen çıktı biçimi ile çok sayıda çeviri dosyası aynı dosyaya "
 "yazılamaz. PO dosyası sözdizimini kullanmayı deneyin."
 
-#: src/write-catalog.c:130
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
 "Belirtilen çıktı biçimi ile çok sayıda çeviri dosyası aynı dosyaya yazılamaz."
 
-#: src/write-catalog.c:163
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
@@ -3167,7 +3174,7 @@ msgstr ""
 "ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
 "çıktı biçimi onları desteklemiyor."
 
-#: src/write-catalog.c:198
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3177,7 +3184,7 @@ msgstr ""
 "desteklemiyor. Bir Java sınıfını .properties dosyası yerine \"msgfmt --java"
 "\" kullanarak üretmeyi deneyin."
 
-#: src/write-catalog.c:203
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3185,65 +3192,61 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen çıktı biçimi çoğul "
 "çevirileri desteklemiyor."
 
-#: src/write-catalog.c:230 src/write-catalog.c:274
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
 
-#: src/write-catalog.c:238 src/write-catalog.c:282
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "standart çıktı"
 
-#: src/write-csharp.c:611
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
-"C# .dll biçimi bağlamları desteklemiyor\n"
-
-#: src/write-csharp.c:678
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "\"%s\" dizini oluşturulamadı"
 
-#: src/write-csharp.c:740
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
 
-#: src/write-java.c:912
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
-"Java ResourceBundle biçimi bağlamları desteklemiyor\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
 
-#: src/write-java.c:937
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "Geçerli bir Java sınıfı ismi değil: %s"
 
-#: src/write-java.c:1021
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java sınıfı derlenemedi, lütfen --verbose seçeneğini kullanın ya da\n"
 "$JAVAC ortam değişkenine uygun değeri atayın."
 
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"Java sınıfı derlenemedi, lütfen --verbose seçeneğini kullanın ya da\n"
+"$JAVAC ortam değişkenine uygun değeri atayın."
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" yazılmak için açılırken hata"
 
-#: src/write-po.c:767
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez"
 
-#: src/write-po.c:1213 src/write-po.c:1342
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3256,7 +3259,7 @@ msgstr ""
 "olabilir. Salt ASCII msgctxt kullanmanız önerilir.\n"
 "%s\n"
 
-#: src/write-po.c:1225 src/write-po.c:1354
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3269,7 +3272,7 @@ msgstr ""
 "olabilir. Salt ASCII msgid kullanmanız önerilir.\n"
 "%s\n"
 
-#: src/write-qt.c:668
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3277,7 +3280,7 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen Qt ileti kataloğu\n"
 "biçimi çoğul çevirileri desteklemiyor\n"
 
-#: src/write-qt.c:694
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3289,7 +3292,7 @@ msgstr ""
 "kullanılmasına izin verir, halbuki ileti kataloğunun msgctxt iletileri\n"
 "ISO-8859-1 kodlamasının dışında karakterler içeriyor.\n"
 
-#: src/write-qt.c:718
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3300,12 +3303,12 @@ msgstr ""
 "kullanılmasına izin verir, halbuki ileti kataloğunun msgid iletileri\n"
 "ISO-8859-1 kodlamasının dışında karakterler içeriyor.\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "%s alt süreçine yazarken hata"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3313,7 +3316,7 @@ msgstr ""
 "ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
 "C# .resources biçimi bağlamları desteklemiyor\n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3321,7 +3324,7 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen C# .resources\n"
 "biçimi çoğul çevirileri desteklemiyor\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3329,7 +3332,7 @@ msgstr ""
 "ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
 "Tcl ileti kataloğu biçemi bağlamları desteklemiyor\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3337,27 +3340,27 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen Tcl ileti kataloğu\n"
 "biçemi çoğul çevirileri desteklemiyor\n"
 
-#: src/x-awk.c:343 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
 
-#: src/x-awk.c:594
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: uyarı: sonlandırılmamış düzenli ifade"
 
-#: src/x-c.c:1155 src/x-csharp.c:1502 src/x-java.c:860
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
 
-#: src/x-c.c:1179
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
 
-#: src/x-csharp.c:217 src/xgettext.c:1845
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3366,7 +3369,7 @@ msgstr ""
 "%s%s içinde ASCII olmayan dizge.\n"
 "Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:264
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3375,7 +3378,7 @@ msgstr ""
 "%s:%d: Çokbaytlı dizilim geçersiz.\n"
 "Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:280
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3384,7 +3387,7 @@ msgstr ""
 "%s:%d: Çokbaytlı dizilim eksik kalmış.\n"
 "Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:292
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3393,7 +3396,7 @@ msgstr ""
 "%s:%d: Dosyanın sonunda çokbaytlı dizilim eksik kalmış.\n"
 "Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:301
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3402,12 +3405,12 @@ msgstr ""
 "%s:%d: Satırın sonunda çokbaytlı dizilim eksik kalmış.\n"
 "Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:310 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv başarısızlığı"
 
-#: src/x-csharp.c:333
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3416,32 +3419,32 @@ msgstr ""
 "%s:%d: Çokbaytlı dizilim geçersiz.\n"
 "Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:1383 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
 
-#: src/x-csharp.c:1505 src/x-java.c:863
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabit"
 
-#: src/x-csharp.c:2009 src/x-java.c:1357
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: uyarı: '}' umulan yerde ')' var"
 
-#: src/x-csharp.c:2043 src/x-java.c:1391
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: uyarı: ')' umulan yerde '}' var"
 
-#: src/x-glade.c:459 src/x-glade.c:466
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:493
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3450,48 +3453,48 @@ msgstr ""
 "\"glade\" dili desteklenmiyor. %s expat'a bağlı.\n"
 "Bu sürüm expat olmaksızın kurgulanmış.\n"
 
-#: src/x-java.c:483
+#: src/x-java.c:492
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
 
-#: src/x-perl.c:309
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: EOF'dan önce hiçbir yerde \"%s\" dizge sonlandırıcısı bulunamadı"
 
-#: src/x-perl.c:1035
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{HEXNUMBER} dizgesinde kapatan kuyruklu ayraç yok"
 
-#: src/x-perl.c:1155
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\l\") aradeğerlemesi geçersiz"
 
-#: src/x-perl.c:1175
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\u\") aradeğerlemesi geçersiz"
 
-#: src/x-perl.c:1209
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: \"%c\" içindeki değişken aradeğerlemesi geçersiz"
 
-#: src/x-perl.c:1222
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\L\") aradeğerlemesi geçersiz"
 
-#: src/x-perl.c:1239
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\U\") aradeğerlemesi geçersiz"
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3503,7 +3506,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3515,7 +3518,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3527,7 +3530,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3539,7 +3542,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3551,7 +3554,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3563,27 +3566,27 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "\"%s\" kodlaması bilinmiyor. Onun yerine ASCII ile işlem yapılacak."
 
-#: src/x-rst.c:110
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: dizge ataması geçersiz"
 
-#: src/x-rst.c:174
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d:  # dan sonra sayı yok"
 
-#: src/x-rst.c:209
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: dizge ifade geçersiz"
 
-#: src/x-sh.c:1076
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3592,27 +3595,27 @@ msgstr ""
 "%s:%lu: uyarı: güvenlikle ilgili sebeplerden dolayı $\"...\" sözdizimi artık "
 "kullanılmayacak; yerine eval_gettext kullanın"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "standart çıktıya yazılırken --join-existing kullanılamaz"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext anahtar sözcükler olmaksızın bulamaz"
 
-#: src/xgettext.c:687
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "uyarı: `%s' dosyası `%s' uzantısı bilinmiyor; C denenecek"
 
-#: src/xgettext.c:738
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n"
 
-#: src/xgettext.c:761
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3620,23 +3623,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=İSİM   çıktıda messages.po yerine İSİM.po kullanılır\n"
 
-#: src/xgettext.c:763
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=DOSYA          çıktı belirtilen dosyaya yazılır\n"
 
-#: src/xgettext.c:765
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DİZİN      çıktı dosyaları DİZİNe yazılır\n"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Girdi dosyası dilinin seçimi:\n"
 
-#: src/xgettext.c:772
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3655,19 +3658,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ile aynı\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Öntanımlı olarak dil, girdi dosyasının uzantısına bakarak saptanır.\n"
 
-#: src/xgettext.c:785
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3676,24 +3679,24 @@ msgstr ""
 "      --from-code=İSİM        girdi dosyası için yerel kodlaması\n"
 "                              (Python, Tcl, Glade dışında)\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Öntanımlı olarak, girdi dosyalarının yerel kodlaması ASCII kabul edilir.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         iletiler mevcut dosyaya bağlanır\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=DOSYA.po girdiler DOSYA.po dosyasından elde edilir\n"
 
-#: src/xgettext.c:797
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3701,17 +3704,17 @@ msgid ""
 msgstr ""
 "  -c, --add-comments[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına yazar\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Dile özel seçenekler:\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           tüm dizgeler çıkarılır\n"
 
-#: src/xgettext.c:805 src/xgettext.c:812
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3724,7 +3727,7 @@ msgstr ""
 "Java,\n"
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3734,7 +3737,7 @@ msgstr ""
 "öntanımlı\n"
 "                              anahtar sözcükler kullanılmamalıdır)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3744,7 +3747,7 @@ msgstr ""
 "      --flag=SÖZCÜK:ARG:İM    SÖZCÜK anahtar sözcüğünün ARG numaralı\n"
 "                              argümanının içindeki dizge için ek im\n"
 
-#: src/xgettext.c:819
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3758,51 +3761,56 @@ msgstr ""
 "Java,\n"
 "                               C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ANSI C üçlü harfleri kabul edilir\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (sadece bu diller: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:829 src/xgettext.c:833
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (sadece C++)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 biçemdizgesi tanıma sonuçları ayrıntılı olur\n"
 
-#: src/xgettext.c:854
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     çıktı bir Java .properties dosyasına yazılır\n"
 
-#: src/xgettext.c:869
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=DİZGE    çıktı için telif hakkı bilgisi\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3810,7 +3818,17 @@ msgstr ""
 "      --foreign-user          yabancı kullanıcılar için FSF telif hakkı\n"
 "                              çıktıda atlanır\n"
 
-#: src/xgettext.c:873
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --copyright-holder=DİZGE    çıktı için telif hakkı bilgisi\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3818,7 +3836,7 @@ msgstr ""
 "      --msgid-bugs-address=EPOSTA@ADRESÄ°\n"
 "                              msgid hatalarının bildirileceği adres\n"
 
-#: src/xgettext.c:875
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3827,7 +3845,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=DİZGE]  msgstr girdilerinde önek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3836,7 +3854,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=DÄ°ZGE]  msgstr girdilerinde sonek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:1642
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3844,16 +3862,16 @@ msgid ""
 msgstr ""
 "Bir --flag argümanı ::[pass-] sözdiziminde olmaz: %s"
 
-#: src/xgettext.c:1741
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "standart girdi"
 
-#: src/xgettext.c:1921 src/xgettext.c:1954 src/xgettext.c:2012
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: uyarı: "
 
-#: src/xgettext.c:1924
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3862,7 +3880,7 @@ msgstr ""
 "Bir biçim dizgesi içinde kullanılabilirse de %s, %s biçim dizgesi içinde "
 "geçerli değil. Sebebi: %s\n"
 
-#: src/xgettext.c:1925
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3871,7 +3889,7 @@ msgstr ""
 "Böyle bildirilebilirse de %s, %s biçim dizgesi içinde geçerli değil. Sebebi: "
 "%s\n"
 
-#: src/xgettext.c:1956
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3884,7 +3902,7 @@ msgstr ""
 "Lütfen isimli argümarları destekleyen bir biçim dizgesi kullanmayı\n"
 "ve argümanlar için bir demet yerine bir eşleme yapmayı düşünün.\n"
 
-#: src/xgettext.c:2014
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3894,27 +3912,27 @@ msgstr ""
 "gettext(\"\") ile başlık girdilerindeki bilgileri\n"
 "döndürür. Boş dizge değildir.\n"
 
-#: src/xgettext.c:2618
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "anahtar sözcük '%.*s' için anlamı belirsiz argüman belirtimi"
 
-#: src/xgettext.c:2645
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "uyarı: anahtar sözcük '%.*s' için bağlam eksik"
 
-#: src/xgettext.c:2670
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "uyarı: '%.*s' anahtar sözcüğünün çoğul biçimi için bağlam eksik"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "tekil ve çoğul biçimler arasında bağlamsal çelişki"
 
-#: src/xgettext.c:2771
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3926,7 +3944,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS değişkenini belirtin; ya da\n"
 "bir --msgid-bugs-address seçeneği kullanın.\n"
 
-#: src/xgettext.c:2970
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "dil `%s' bilinmiyor"
@@ -3934,3 +3952,33 @@ msgstr "dil `%s' bilinmiyor"
 #: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr ""
+
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "%%%c için çoklu başvuru."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Telif Hakkı (C) %s Free Software Foundation, Inc.\n"
+#~ "Bu bir serbest yazılımdır; kopyalama koşulları için kaynak koduna "
+#~ "bakınız.\n"
+#~ "Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
+#~ "UYGUNLUĞU için bile garanti verilmez.\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
+#~ "C# .dll biçimi bağlamları desteklemiyor\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
+#~ "Java ResourceBundle biçimi bağlamları desteklemiyor\n"
diff --git a/gettext-tools/po/uk.po b/gettext-tools/po/uk.po
index ac6bd8b24..3306ad1e3 100644
--- a/gettext-tools/po/uk.po
+++ b/gettext-tools/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-05-15 02:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-07-04 12:19+0200\n"
 "Last-Translator: Maxim V. Dziumanenko \n"
 "Language-Team: Ukrainian \n"
@@ -17,89 +17,89 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "неправильний аргумент %s для %s"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "неоднозначний аргумент %s для %s"
 
-#: gnulib-lib/argmatch.c:154
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Допустимі аргументи:"
 
-#: gnulib-lib/clean-temp.c:334
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "не вдається знайти тимчасовий каталог, встановіть змінну $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:348
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "не вдається створити тимчасовий каталог при використанні шаблону \"%s\""
 
-#: gnulib-lib/clean-temp.c:444
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "не вдається видалити тимчасовий файл \"%s\""
 
-#: gnulib-lib/clean-temp.c:459
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "не вдається видалити тимчасовий каталог \"%s\""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "помилка запису"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:55 src/msggrep.c:245
-#: src/open-catalog.c:122 src/read-mo.c:253 src/read-tcl.c:125
-#: src/urlget.c:201 src/xgettext.c:1750 src/xgettext.c:1763
-#: src/xgettext.c:1773
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "помилка при відкриванні \"%s\" для читання"
 
-#: gnulib-lib/copy-file.c:74
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "не вдається відкрити резервний файл \"%s\" для запису"
 
-#: gnulib-lib/copy-file.c:82 src/urlget.c:213
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "помилка читання \"%s\""
 
-#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:92
-#: gnulib-lib/copy-file.c:131
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "помилка запису \"%s\""
 
-#: gnulib-lib/copy-file.c:94 gnulib-lib/copy-file.c:133 src/urlget.c:223
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "помилка після читання \"%s\""
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:840
-#: src/msginit.c:908 src/msginit.c:1068 src/msginit.c:1151
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:78
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "помилка у функції fdopen()"
 
-#: gnulib-lib/csharpcomp.c:540
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Компілятор C# не знайдено, спробуйте встановити pnet"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Не знайдено віртуальну машину pnet, спробуйте встановити pnet"
@@ -108,122 +108,122 @@ msgstr "Не знайдено віртуальну машину pnet, спроб
 msgid "Unknown system error"
 msgstr "Невідома системна помилка"
 
-#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:261 gnulib-lib/execute.c:303
-#: gnulib-lib/pipe.c:230 gnulib-lib/pipe.c:348 gnulib-lib/pipe.c:408
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "аварійне завершення створеного процесу %s"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: неоднозначний параметр `%s'\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: параметр `--%s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: параметр `%c%s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: параметр `%s' має використовуватись з аргументом\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: невідомий параметр `--%s'\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: невідомий параметр `%c%s'\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: неправильний параметр -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: неправильний параметр -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: параметр %c має використовуватись з аргументом\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: неоднозначний параметр `-W %s'\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: параметр `-W %s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/javacomp.c:128 gnulib-lib/javacomp.c:142
-#: gnulib-lib/javacomp.c:158
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "некоректний аргумент source_version для compile_java_class"
 
-#: gnulib-lib/javacomp.c:173 gnulib-lib/javacomp.c:194
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "некоректний аргумент target_version для compile_java_class"
 
-#: gnulib-lib/javacomp.c:505 src/write-csharp.c:714 src/write-java.c:988
-#: src/write-java.c:1000
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "не вдається створити \"%s\""
 
-#: gnulib-lib/javacomp.c:512 src/write-catalog.c:254 src/write-catalog.c:318
-#: src/write-csharp.c:723 src/write-java.c:1009 src/write-mo.c:812
-#: src/write-qt.c:749 src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "помилка запису файлу \"%s\""
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Компілятор Java не знайдено, встановіть gcj або встановіть змінну $JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Не знайдено віртуальну машину Java, встановіть gij або встановіть змінну "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:848 src/msginit.c:916
-#: src/msginit.c:1076
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "помилка вводу-виводу у дочірньому процесі %s"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:39 src/msgl-check.c:452 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:436 libgettextpo/gettext-po.c:1245
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "пам'ять вичерпано"
 
-#: gnulib-lib/pipe.c:156 gnulib-lib/pipe.c:159 gnulib-lib/pipe.c:263
-#: gnulib-lib/pipe.c:266
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "не вдається створити канал"
@@ -247,75 +247,75 @@ msgstr "не вдається створити канал"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:230
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "аварійне завершення DuplicateHandle з кодом помилки 0x%08x"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "аварійне завершення _open_osfhandle"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "дочірній процес %s"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "дочірній процес %s отримав фатальний сигнал %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 "'%s' не є правильним рядком формату %s, на відміну від 'msgid'. Причина: %s"
 
-#: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:624 src/format-librep.c:313
-#: src/format-pascal.c:402 src/format-perl.c:585 src/format-php.c:351
-#: src/format-qt.c:138 src/format-tcl.c:391 src/format-ycp.c:145
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "в 'msgid' відсутня специфікація формату для аргументу %u, як у '%s'"
 
-#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:634 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
-#: src/format-qt.c:137 src/format-tcl.c:401 src/format-ycp.c:144
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "відсутня специфікація формату для аргументу %u у '%s'"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:911
-#: src/format-elisp.c:379 src/format-gcc-internal.c:654
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
-#: src/format-php.c:381 src/format-python.c:511 src/format-tcl.c:421
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "в 'msgid' та '%s' не збігаються специфікації формату для %u"
 
-#: src/format-boost.c:450
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 "Директива з номером %u починається з символу |, але не закінчується символом "
 "|."
 
-#: src/format-c.c:182
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -325,54 +325,54 @@ msgstr ""
 "формату. Допустимі назви макросів перелічені у розділі 7.8.1 стандарту ISO C "
 "99."
 
-#: src/format-c.c:589
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "У директиві з номером %u, лексема після '<' не завершується дужкою '>'."
 
-#: src/format-c.c:815
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Рядок посилається на аргумент з номером %u, але ігнорується аргумент з "
 "номером %u."
 
-#: src/format-c.c:902 src/format-csharp.c:207 src/format-python.c:502
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "не відповідає кількість специфікацій формату у 'msgid' та '%s'"
 
-#: src/format-csharp.c:89 src/format-java.c:206
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "У директиві з номером %u, дужка '{' не завершується номером аргументу."
 
-#: src/format-csharp.c:110
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "У директиві з номером %u, знак ',' не завершується числом."
 
-#: src/format-csharp.c:131 src/format-java.c:192
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 "Рядок закінчується у середині директиви: знайдено '{' без відповідної дужки "
 "'}'."
 
-#: src/format-csharp.c:140
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
 "Директива з номером %u закінчується неправильним символом '%c' замість '}'."
 
-#: src/format-csharp.c:141
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "Директива з номером %u закінчується неправильним символом замість '}'."
 
-#: src/format-csharp.c:162 src/format-java.c:347
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
@@ -380,23 +380,23 @@ msgstr ""
 "Рядок починається в середині директиви: знайдено '}' без відповідної дужки "
 "'{'."
 
-#: src/format-csharp.c:163
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Рядок містить одну дужку '}' після директиви %u."
 
-#: src/format-gcc-internal.c:254
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "У директиві з номером %u, некоректна комбінація ключів."
 
-#: src/format-gcc-internal.c:291 src/format-gcc-internal.c:397
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 "У директиві з номером %u, не допускається визначник точності перед '%c'."
 
-#: src/format-gcc-internal.c:333
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -405,31 +405,39 @@ msgstr ""
 "В директиві з номером %u, номер аргументу для визначника точності має "
 "дорівнювати %u."
 
-#: src/format-gcc-internal.c:405
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"У директиві з номером %u, не допускається визначник точності перед '%c'."
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "У директиві з номером %u, некоректний визначник точності."
 
-#: src/format-gcc-internal.c:460
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "У директиві з номером %u, ключі не дозволяються перед '%c'."
 
-#: src/format-gcc-internal.c:672
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "'msgid' використовує %%m, а '%s' не використовує"
 
-#: src/format-gcc-internal.c:675
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' не використовує %%m а '%s' використовує %%m"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "Рядок закінчується посеред директиви."
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
@@ -437,27 +445,27 @@ msgstr ""
 "Рядок посилається на аргументи як через абсолютні номери аргументів, так і "
 "через не нумеровані специфікації аргументів."
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "В директиві з номером %u, аргумент з номером 0 не є додатнім цілим."
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr "В директиві з номером %u, аргумент ширини з номером 0 не є додатнім."
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr "У директиві з номером %u, аргумент точності з номером 0 не є додатнім."
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
@@ -466,7 +474,7 @@ msgstr ""
 "У директиві з номером %u, символ '%c' не є допустимою специфікацією "
 "перетворення."
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
@@ -475,12 +483,12 @@ msgstr ""
 "Символ, що завершує директиву з номером %u не є допустимою специфікацією "
 "перетворення."
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "Рядок посилається на аргумент з номером %u несумісним способом."
 
-#: src/format-java.c:241
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -488,18 +496,18 @@ msgid ""
 msgstr ""
 "У директиві з номером %u, рядок \"%s\"  у неприпустимому стилі дати/часу."
 
-#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "У директиві з номером %u, \"%s\" не завершується комою."
 
-#: src/format-java.c:275
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "У директиві з номером %u, рядок \"%s\" у неприпустимому форматі числа."
 
-#: src/format-java.c:324
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
@@ -508,12 +516,12 @@ msgstr ""
 "У директиві з номером %u, номер аргументу не завершується комою та одним з\"%"
 "s\", \"%s\", \"%s\", \"%s\"."
 
-#: src/format-java.c:573
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "У директиві з номером %u, вибір не містить номер."
 
-#: src/format-java.c:584
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
@@ -522,27 +530,27 @@ msgstr ""
 "У директиві з номером %u, вибір містить число, яке не завершується '<', '#' "
 "чи '%s'."
 
-#: src/format-java.c:746
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "специфікація формату аргументу {%u}, тобто '%s', не існує у 'msgid'"
 
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "специфікація формату аргументу {%u} не існує у '%s'"
 
-#: src/format-java.c:776
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr ""
 "специфікації формату у 'msgid' та '%s' для аргументу {%u} не збігаються"
 
-#: src/format-lisp.c:2338 src/format-lisp.c:2350 src/format-scheme.c:2364
-#: src/format-scheme.c:2376
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
@@ -551,7 +559,7 @@ msgstr ""
 "У директиві з номером %u, параметр %u має тип '%s', але очікувався параметр "
 "типу '%s'."
 
-#: src/format-lisp.c:2373 src/format-scheme.c:2399
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -569,33 +577,33 @@ msgstr[2] ""
 "У директиві з номером %u, вказано надто багато параметрів; очікувалось не "
 "більше ніж %u параметрів."
 
-#: src/format-lisp.c:2497 src/format-scheme.c:2500
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "У директиві з номером %u, '%c' не завершується цифрою."
 
-#: src/format-lisp.c:2737 src/format-scheme.c:2755
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "У директиві з номером %u, аргумент %d - від'ємний."
 
-#: src/format-lisp.c:2806
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Рядок закінчується у середині директиви ~/.../"
 
-#: src/format-lisp.c:2844 src/format-lisp.c:3109 src/format-lisp.c:3226
-#: src/format-lisp.c:3286 src/format-lisp.c:3398 src/format-scheme.c:2841
-#: src/format-scheme.c:3106 src/format-scheme.c:3223 src/format-scheme.c:3321
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Знайдено '~%c' без відповідного '~%c'."
 
-#: src/format-lisp.c:2864 src/format-scheme.c:2861
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "У директиві з номером %u, вказано обидва модифікатори, як @, так і :"
 
-#: src/format-lisp.c:2977 src/format-scheme.c:2974
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -604,27 +612,27 @@ msgstr ""
 "У директиві з номером %u, '~:[' не завершується двома реченнями, "
 "розділеними  '~;'."
 
-#: src/format-lisp.c:3327 src/format-scheme.c:3264
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 "У директиві з номером %u, '~;' використовується у неправильній позиції."
 
-#: src/format-lisp.c:3433 src/format-scheme.c:3356
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "Рядок посилається на деякий аргумент несумісним способом."
 
-#: src/format-lisp.c:3475 src/format-scheme.c:3398
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "специфікації формату у 'msgid' та '%s' не еквівалентні"
 
-#: src/format-lisp.c:3491 src/format-scheme.c:3414
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "специфікації формату у '%s' не є підмножиною специфікацій з 'msgid'"
 
-#: src/format-perl.c:434
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
@@ -633,24 +641,24 @@ msgstr ""
 "У директиві з номером %u, специфікація розміру несумісна з специфікацією "
 "перетворення '%c'."
 
-#: src/format-perl-brace.c:200 src/format-python.c:460 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "специфікація формату для аргументу '%s' не існує у '%s'"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 "Рядок посилається як на аргументи з назвами, так і на аргументи без назв."
 
-#: src/format-python.c:344
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Рядок посилається на аргумент з назвою '%s' несумісним способом."
 
-#: src/format-python.c:420
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -659,7 +667,7 @@ msgstr ""
 "специфікації формату у 'msgid' очікують відображення, а специфікації у '%s' "
 "вимагають кортеж"
 
-#: src/format-python.c:427
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -668,7 +676,7 @@ msgstr ""
 "специфікації формату у 'msgid' очікують кортеж, а специфікації у '%s' "
 "очікують відображення"
 
-#: src/format-python.c:450 src/format-sh.c:298
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -676,23 +684,25 @@ msgid ""
 msgstr ""
 "у 'msgid' відсутні специфікації формату для аргументу '%s', як і у '%s'"
 
-#: src/format-python.c:480
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr ""
 "у 'msgid' та '%s' не збігаються специфікації формату для аргументу '%s'"
 
-#: src/format-qt.c:81
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "Множинні посилання на %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "Рядок посилається на змінну оболонки з не-ASCII назвою."
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
@@ -700,7 +710,7 @@ msgstr ""
 "Рядок посилається на змінну оболонки з складним синтаксисом дужок оболонки. "
 "Цей синтаксис тут не підтримується з міркувань безпеки."
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
@@ -708,45 +718,42 @@ msgstr ""
 "Рядок посилається на змінну оболонки, значення якої може бути іншим у "
 "функціях оболонки."
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "Рядок посилається на змінну оболонки з порожньою назвою."
 
-#: src/format-ycp.c:91
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr "У директиві з номером %u, символ '%c' не є цифрою від 1 до 9."
 
-#: src/format-ycp.c:92
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr "Символ, що завершує директиву з номером %u, не є цифрою від 1 до 9."
 
-#: src/hostname.c:179 src/msgattrib.c:326 src/msgcat.c:282 src/msgcmp.c:162
-#: src/msgcomm.c:269 src/msgconv.c:224 src/msgen.c:212 src/msgexec.c:179
-#: src/msgfilter.c:281 src/msgfmt.c:365 src/msggrep.c:399 src/msginit.c:258
-#: src/msgmerge.c:320 src/msgunfmt.c:251 src/msguniq.c:248
-#: src/recode-sr-latin.c:111 src/urlget.c:131 src/xgettext.c:509
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Авторські права (C) %s Free Software Foundation, Inc.\n"
-"Це - вільне програмне забезпечення; умови копіювання викладені у вихідному\n"
-"коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ\n"
-"або ПРИДАТНОСТІ ДО ПЕВНОЇ МЕТИ.\n"
 
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
 #: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:263
-#: src/msgmerge.c:325 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:514
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Автор програми %s.\n"
@@ -754,26 +761,26 @@ msgstr "Автор програми %s.\n"
 #. This is a proper name. See the gettext manual, section Names.
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
 #: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:263 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
 #: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:273 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "надто багато аргументів"
 
 #: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
 #: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:347
-#: src/msgmerge.c:446 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:730
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Спробуйте `%s --help', щоб переглянути докладнішу інформацію.\n"
 
-#: src/hostname.c:211 src/msginit.c:351 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Використання: %s [ПАРАМЕТР]\n"
@@ -811,27 +818,27 @@ msgstr "  -i, --ip-address            адреси системи\n"
 
 #: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
 #: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:403
-#: src/msgmerge.c:563 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:880
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Інформативний вивід:\n"
 
 #: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
 #: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:405
-#: src/msgmerge.c:565 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:882
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  вивести цю довідку та вийти\n"
 
 #: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
 #: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:407
-#: src/msgmerge.c:567 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:884
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               вивести інформацію про версію та вийти\n"
@@ -842,9 +849,9 @@ msgstr "  -V, --version               вивести інформацію про
 #. bugs (typically your translation team's web or email address).
 #: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
 #: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:414
-#: src/msgmerge.c:578 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:891
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "Про помилки повідомляйте на .\n"
 
@@ -853,8 +860,8 @@ msgstr "Про помилки повідомляйте на "
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2940,7 +2948,7 @@ msgstr ""
 "Кодування \"%s\" не є переносною назвою кодування.\n"
 "Перетворення повідомлення у кодування користувача може не працювати.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2949,7 +2957,7 @@ msgstr ""
 "Кодування \"%s\" не підтримується. %s використовує iconv(),\n"
 "а iconv() не підтримує \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2957,15 +2965,15 @@ msgstr ""
 "Встановлення GNU libiconv та повторне встановлення GNU gettext\n"
 "виправить цю проблему.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Виконання продовжується у будь-якому разі, очікуються помилки аналізу."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Виконання продовжується у будь-якому разі."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2974,7 +2982,7 @@ msgstr ""
 "Кодування \"%s\" не підтримується. %s використовує iconv().\n"
 "Ця версія скомпільована без підтримки iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2983,32 +2991,32 @@ msgstr ""
 "Перетворення повідомлення у вказане користувачем кодування може не "
 "працювати.\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "несумісне використання #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "пропущено розділ `msgstr[]'"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "пропущено розділ `msgid_plural'"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "пропущено розділ `msgstr'"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "перша множинна форма має ненульовий індекс"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "множинна форма має неправильний індекс"
@@ -3018,7 +3026,7 @@ msgstr "множинна форма має неправильний індекс
 msgid "too many errors, aborting"
 msgstr "надто багато помилок, виконання перервано"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:708 src/write-po.c:833
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "неправильна мультибайтна послідовність"
@@ -3062,60 +3070,60 @@ msgstr "кінець рядка посеред рядка"
 msgid "context separator  within string"
 msgstr "розділювач контексту  посеред рядка"
 
-#: src/read-catalog.c:328 src/xgettext.c:903
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "цей файл не може містити доменних директив"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "дублікат визначення повідомлення"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "це місце першого визначення"
 
-#: src/read-mo.c:106 src/read-mo.c:127 src/read-mo.c:173 src/read-mo.c:200
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "файл \"%s\" обрізаний"
 
-#: src/read-mo.c:130
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файл \"%s\" містить рядок з не-NUL завершенням"
 
-#: src/read-mo.c:166 src/read-mo.c:275
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "файл \"%s\" не у GNU .mo форматі"
 
-#: src/read-mo.c:179
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файл \"%s\" містить рядок з не-NUL завершенням, у %s"
 
-#: src/read-properties.c:228
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "попередження: неправильний синтаксис \\uxxxx символу Юнікоду"
 
-#: src/read-stringtable.c:803
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "попередження: незавершений рядок"
 
-#: src/read-stringtable.c:811
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "попередження: синтаксична помилка"
 
-#: src/read-stringtable.c:872 src/read-stringtable.c:894
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "попередження: незавершена пара ключ/значення"
 
-#: src/read-stringtable.c:940
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr "попередження: синтаксична помилка, після рядка очікувався знак ';'"
 
-#: src/read-stringtable.c:949
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "попередження: синтаксична помилка, після рядка очікується '=' або ';'"
 
@@ -3180,7 +3188,7 @@ msgstr ""
 msgid "error writing stdout"
 msgstr "помилка при записі у стандартний вивід"
 
-#: src/write-catalog.c:127
+#: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
@@ -3188,7 +3196,7 @@ msgstr ""
 "Не можна виводити декілька доменів перекладу у єдиний файл з вказаним "
 "форматом. Спробуйте натомість використати PO синтаксис."
 
-#: src/write-catalog.c:130
+#: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
@@ -3196,7 +3204,7 @@ msgstr ""
 "Не можна виводити декілька доменів перекладу у єдиний файл з вказаним "
 "форматом виводу."
 
-#: src/write-catalog.c:163
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
@@ -3204,7 +3212,7 @@ msgstr ""
 "каталог повідомлень містить залежний від контексту переклад, але контексти "
 "не підтримуються форматом виводу."
 
-#: src/write-catalog.c:198
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -3214,7 +3222,7 @@ msgstr ""
 "не підтримує. Спробуйте створити Java клас використовуючи \"msgfmt --java\", "
 "замість створення файлу властивостей."
 
-#: src/write-catalog.c:203
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
@@ -3222,58 +3230,53 @@ msgstr ""
 "каталог повідомлень має переклад з множинними формами, але формат виводу їх "
 "не підтримує."
 
-#: src/write-catalog.c:230 src/write-catalog.c:274
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "не вдається створити файл виводу \"%s\""
 
-#: src/write-catalog.c:238 src/write-catalog.c:282
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "стандартний вивід"
 
-#: src/write-csharp.c:611
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"каталог повідомлень містить залежний від контексту переклад,\n"
-"але формат .dll бібліотек для C# не підтримує контексти\n"
-
-#: src/write-csharp.c:678
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "не вдається створити каталог \"%s\""
 
-#: src/write-csharp.c:740
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "помилка при компіляції класу C#, спробуйте --verbose"
 
-#: src/write-java.c:912
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"каталог повідомлень містить залежний від контексту переклад,\n"
-"але формат Java ResourceBundle не підтримує контексти\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "помилка при компіляції класу C#, спробуйте --verbose"
 
-#: src/write-java.c:937
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "не є правильною назвою класу Java: %s"
 
-#: src/write-java.c:1021
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "помилка при компіляції класу Java, спробуйте --verbose або встановіть $JAVAC"
 
-#: src/write-mo.c:800 src/write-qt.c:737 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"помилка при компіляції класу Java, спробуйте --verbose або встановіть $JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "помилка при відкриванні \"%s\" для запису"
 
-#: src/write-po.c:767
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3281,7 +3284,7 @@ msgstr ""
 "інтернаціоналізовані повідомлення не повинні містити `\\%c' escape-"
 "послідовність"
 
-#: src/write-po.c:1213 src/write-po.c:1342
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3294,7 +3297,7 @@ msgstr ""
 "вашого кодування символів. Використовуйте лише ASCII символи у msgctxt.\n"
 "%s\n"
 
-#: src/write-po.c:1225 src/write-po.c:1354
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3307,7 +3310,7 @@ msgstr ""
 "вашого кодування символів. Використовуйте лише ASCII символи у msgid.\n"
 "%s\n"
 
-#: src/write-qt.c:668
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3315,7 +3318,7 @@ msgstr ""
 "каталог повідомлень має переклад з множинними формами\n"
 "але формат каталогу повідомлень Qt не підтримує множинні форми\n"
 
-#: src/write-qt.c:694
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3328,7 +3331,7 @@ msgstr ""
 "перекладених\n"
 "рядків, а не у рядках контексту\n"
 
-#: src/write-qt.c:718
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3339,12 +3342,12 @@ msgstr ""
 "але формат каталогу повідомлень Qt підтримує Юнікод лише у перекладених "
 "рядках\n"
 
-#: src/write-resources.c:95
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "помилка при записі у \"%s\" дочірній процес"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3352,7 +3355,7 @@ msgstr ""
 "каталог повідомлень містить залежний від контексту переклад\n"
 "але формат каталогу ресурсів C# не підтримує контексти\n"
 
-#: src/write-resources.c:150
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3360,7 +3363,7 @@ msgstr ""
 "каталог повідомлень має переклад з множинними формами\n"
 "але формат каталогу ресурсів C# не підтримує множинні форми\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3368,7 +3371,7 @@ msgstr ""
 "каталог повідомлень містить залежний від контексту переклад\n"
 "але формат каталогу повідомлень Tcl не підтримує контексти\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3376,27 +3379,27 @@ msgstr ""
 "каталог повідомлень містить переклад з множинними формами\n"
 "але формат каталогу повідомлень Tcl не підтримує множинні форми\n"
 
-#: src/x-awk.c:343 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: попередження: незавершений рядок"
 
-#: src/x-awk.c:594
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: попередження: незавершений регулярний вираз"
 
-#: src/x-c.c:1155 src/x-csharp.c:1502 src/x-java.c:860
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: попередження: незавершена символьна константа"
 
-#: src/x-c.c:1179
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: попередження: незавершений символьний літерал"
 
-#: src/x-csharp.c:217 src/xgettext.c:1845
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3405,7 +3408,7 @@ msgstr ""
 "Не-ASCII рядок у %s%s.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:264
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3414,7 +3417,7 @@ msgstr ""
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:280
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3423,7 +3426,7 @@ msgstr ""
 "%s:%d: Довга незавершена мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:292
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3432,7 +3435,7 @@ msgstr ""
 "%s:%d: Незавершена мультибайтова послідовність наприкінці файлу.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:301
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3441,12 +3444,12 @@ msgstr ""
 "%s:%d: Незавершена мультибайтова послідовність наприкінці рядка.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:310 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: помилка iconv"
 
-#: src/x-csharp.c:333
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3455,32 +3458,32 @@ msgstr ""
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:1383 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: попередження: неправильний символ Юнікоду"
 
-#: src/x-csharp.c:1505 src/x-java.c:863
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: попередження: незавершена символьна константа"
 
-#: src/x-csharp.c:2009 src/x-java.c:1357
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: попередження: знайдено ')' там де очікувалась '}'"
 
-#: src/x-csharp.c:2043 src/x-java.c:1391
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: попередження: знайдено '}' там де очікувалась ')'"
 
-#: src/x-glade.c:459 src/x-glade.c:466
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:493
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3489,47 +3492,47 @@ msgstr ""
 "Мова \"glade\" не підтримується. %s залежить від expat.\n"
 "Ця версія скомпільована без підтримки expat.\n"
 
-#: src/x-java.c:483
+#: src/x-java.c:492
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: попередження: незавершений рядок"
 
-#: src/x-perl.c:309
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: не вдається знайти символ завершення рядка \"%s\" до EOF"
 
-#: src/x-perl.c:1035
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: відсутня права фігурна дужка у \\x{ШІСТН.ЧИСЛО}"
 
-#: src/x-perl.c:1155
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\l\") 8-бітного символу \"%c\""
 
-#: src/x-perl.c:1175
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\u\") 8-бітного символу \"%c\""
 
-#: src/x-perl.c:1209
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: неправильна інтерполяція змінної у \"%c\""
 
-#: src/x-perl.c:1222
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\L\") 8-бітного символу \"%c\""
 
-#: src/x-perl.c:1239
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\U\") 8-бітного символу \"%c\""
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3540,7 +3543,7 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3551,7 +3554,7 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3562,7 +3565,7 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3573,7 +3576,7 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3584,7 +3587,7 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3595,27 +3598,27 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Невідоме кодування \"%s\". Вважається кодування ASCII."
 
-#: src/x-rst.c:110
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неправильне визначення рядка"
 
-#: src/x-rst.c:174
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: після знаку # відсутнє число"
 
-#: src/x-rst.c:209
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неправильний символьний вираз"
 
-#: src/x-sh.c:1076
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3624,30 +3627,30 @@ msgstr ""
 "%s:%lu: попередження: синтаксис $\"...\" є забороненим з міркувань безпеки; "
 "натомість використовуйте eval_gettext"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing не може використовуватись, якщо вивід направляється у "
 "стандартний вивід"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може працювати без вказаних ключових слів для пошуку"
 
-#: src/xgettext.c:687
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "попередження: у файлі `%s' невідоме розширення `%s'; спроба використати C"
 
-#: src/xgettext.c:738
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Витягує рядки для перекладу з вказаних вхідних файлів.\n"
 
-#: src/xgettext.c:761
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3656,12 +3659,12 @@ msgstr ""
 "  -d, --default-domain=НАЗВА  виводити у файл НАЗВА.po (замість messages."
 "po)\n"
 
-#: src/xgettext.c:763
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=ФАЙЛ           записувати вивід у вказаний файл\n"
 
-#: src/xgettext.c:765
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3669,12 +3672,12 @@ msgstr ""
 "  -p, --output-dir=КАТАЛОГ    файли виводу будуть створені у каталозі "
 "КАТАЛОГ\n"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Вибір мови вхідного файлу:\n"
 
-#: src/xgettext.c:772
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3693,19 +3696,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   скорочення для --language=C++\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Типово, мова визначається за розширенням назви вхідного файлу.\n"
 
-#: src/xgettext.c:785
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3714,24 +3717,24 @@ msgstr ""
 "      --from-code=НАЗВА       кодування для вхідних файлів\n"
 "                                (за винятком Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Типово, вважається, що вхідні файли у кодуванні ASCII.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         об'єднати повідомлення з існуючим файлом\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=ФАЙЛ.po  елементи з ФАЙЛ.po не будуть витягуватись\n"
 
-#: src/xgettext.c:797
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3741,17 +3744,17 @@ msgstr ""
 "                              передують рядкам ключового слова) у файл "
 "виводу\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Параметри особливі для мови:\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           витягнути усі рядки\n"
 
-#: src/xgettext.c:805 src/xgettext.c:812
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3764,7 +3767,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3775,7 +3778,7 @@ msgstr ""
 "                              (вживання СЛОВО не означає невикористання\n"
 "                               типових ключових слів)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3785,7 +3788,7 @@ msgstr ""
 "      --flag=СЛОВО:АРГ:ОЗНАКА додаткова ознака для рядків посеред номера\n"
 "                              аргументу АРГ ключового слова СЛОВО\n"
 
-#: src/xgettext.c:819
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3798,50 +3801,55 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             розпізнавати ANSI C trigraph-и на вході\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (лише мови C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    розпізнавати рядки у Qt форматі\n"
 
-#: src/xgettext.c:829 src/xgettext.c:833
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (лише мова C++)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    розпізнавати рядки у Qt форматі\n"
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 розпізнавати рядки у форматі Boost\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 докладніший результат пошуку рядків формату\n"
 
-#: src/xgettext.c:854
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     виводити у файл Java .properties\n"
 
-#: src/xgettext.c:869
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=РЯДОК  встановити власника авторських прав\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3849,7 +3857,17 @@ msgstr ""
 "      --foreign-user          пропускати у виводі FSF copyright для "
 "сторонніх користувачів\n"
 
-#: src/xgettext.c:873
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --copyright-holder=РЯДОК  встановити власника авторських прав\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3857,7 +3875,7 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@АДРЕСА   адреса звітування про помилки у "
 "msgid\n"
 
-#: src/xgettext.c:875
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3866,7 +3884,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=РЯДОК]   вживати РЯДОК або \"\" як префікс елементів "
 "msgstr\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3875,7 +3893,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=РЯДОК]   вживати РЯДОК або \"\" як суфікс елементів "
 "msgstr\n"
 
-#: src/xgettext.c:1642
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3884,16 +3902,16 @@ msgstr ""
 "Аргумент --flag не підтримує синтаксис <ключове_слово>::[pass-]"
 ": %s"
 
-#: src/xgettext.c:1741
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "стандартний ввід"
 
-#: src/xgettext.c:1921 src/xgettext.c:1954 src/xgettext.c:2012
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: попередження: "
 
-#: src/xgettext.c:1924
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3902,7 +3920,7 @@ msgstr ""
 "Хоча й використовується у позиції рядку формату, %s не є правильним %s "
 "рядком формату. Причина: %s\n"
 
-#: src/xgettext.c:1925
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3911,7 +3929,7 @@ msgstr ""
 "Хоча й заявлений як такий, %s не є правильним %s рядком формату. Причина: %"
 "s\n"
 
-#: src/xgettext.c:1956
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3924,7 +3942,7 @@ msgstr ""
 "Замість кортежу аргументів, використовуйте рядок формату з аргументами,\n"
 "що мають назву та їх підстановку.\n"
 
-#: src/xgettext.c:2014
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3934,29 +3952,29 @@ msgstr ""
 "gettext(\"\") повертає елемент заголовку\n"
 "метаінформації, а не порожній рядок.\n"
 
-#: src/xgettext.c:2618
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неоднозначно вказане ключове слово '%.*s'"
 
-#: src/xgettext.c:2645
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "попередження: відсутній контекст для ключового слова '%.*s'"
 
-#: src/xgettext.c:2670
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "попередження: відсутній контекст для множинного аргументу ключового слова '%."
 "*s'"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "невідповідність контексту між формою однини та множини"
 
-#: src/xgettext.c:2771
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3968,7 +3986,7 @@ msgstr ""
 "тут змінну MSGID_BUGS_ADDRESS; у іншому випадку\n"
 "вкажіть --msgid-bugs-address аргумент командного рядка.\n"
 
-#: src/xgettext.c:2970
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "невідома мова `%s'"
@@ -3976,3 +3994,34 @@ msgstr "невідома мова `%s'"
 #: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr "<без назви>"
+
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "Множинні посилання на %%%c."
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "Авторські права (C) %s Free Software Foundation, Inc.\n"
+#~ "Це - вільне програмне забезпечення; умови копіювання викладені у "
+#~ "вихідному\n"
+#~ "коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ "
+#~ "ПРИДАТНОСТІ\n"
+#~ "або ПРИДАТНОСТІ ДО ПЕВНОЇ МЕТИ.\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "каталог повідомлень містить залежний від контексту переклад,\n"
+#~ "але формат .dll бібліотек для C# не підтримує контексти\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "каталог повідомлень містить залежний від контексту переклад,\n"
+#~ "але формат Java ResourceBundle не підтримує контексти\n"
diff --git a/gettext-tools/po/vi.po b/gettext-tools/po/vi.po
index ae9a92419..b5d674fd2 100644
--- a/gettext-tools/po/vi.po
+++ b/gettext-tools/po/vi.po
@@ -1,12 +1,12 @@
 # Vietnamese Translation for gettext-tools.
 # Copyright © 2007 Free Software Foundation, Inc.
 # Clytie Siddall , 2005-2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-10-23 09:10+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2007-10-17 16:11+0930\n"
 "Last-Translator: Clytie Siddall \n"
 "Language-Team: Vietnamese \n"
diff --git a/gettext-tools/po/zh_CN.po b/gettext-tools/po/zh_CN.po
index 6750ca7b5..24cbef40f 100644
--- a/gettext-tools/po/zh_CN.po
+++ b/gettext-tools/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2006-08-22 23:09+0800\n"
 "Last-Translator: Funda Wang \n"
 "Language-Team: Chinese (simplified) \n"
@@ -16,87 +16,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "%2$s 的参数 %1$s 无效"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "%2$s 的参数 %1$s 含糊"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "有效的参数为："
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "无法创建输出文件“%s”"
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "无法创建输出文件“%s”"
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "写错误"
 
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "打开“%s”读取时出错"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "无法打开备份文件“%s”写入"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "读取“%s”出错"
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "写入“%s”出错"
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "读取“%s”后出错"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() 失败"
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "未找到 C# 编译器，试着安装 pnet"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "未找到 C# 虚拟机，试着安装 pnet"
@@ -105,119 +106,119 @@ msgstr "未找到 C# 虚拟机，试着安装 pnet"
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s 子进程失败"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s：选项“%s”含糊\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s：选项“%s”需要参数\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s：非法选项 -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s：无效选项 -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s：选项需要参数 -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”含糊\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s：选项“-W %s”不允许参数\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "compile_java_class 中有无效的 source_version 参数"
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class 中有无效的 target_version 参数"
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "创建“%s”失败"
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "写入“%s”出错"
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "未找到 Java 编译器，试着安装 gcj 或设置 $JAVAC"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "未找到 Java 虚拟机，试着安装 gij 或设置 $JAVA"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s 子进程 I/O 错误"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "无法创建管道"
@@ -241,72 +242,72 @@ msgstr "无法创建管道"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr "“"
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr "”"
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandle 失败，错误码为 0x%08x"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 失败"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s 子进程"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s 子进程收到致命信号 %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr "不像“msgid”，“%s”不是有效的 %s 格式字符串。原因：%s"
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "“%2$s”中的参数 %1$u 的格式指定符在“msgid”中不存在"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "参数 %u 的格式指定符在“%s”中不存在"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "参数 %2$u 的“msgid”和“%1$s”中的格式指定符并不相同"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "第 %u 条指令以“|”开始但并不以“|”。"
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -315,208 +316,215 @@ msgstr ""
 "第 %u 条指令中，“<”后的记号并不是格式指定符宏的名称。有效的宏名列在 ISO C 99 "
 "章节 7.8.1 中。"
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "第 %u 条指令中，没有与“<”匹配的“>”。"
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "字符串引用了第 %u 个参数但是却忽略了第 %u 个参数。"
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "“msgid”和“%s”中的格式指定符数量不匹配"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr "第 %u 条指令中，“{”后没有参数编号。"
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "第 %u 条指令中，“,”后没有参数编号。"
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "指令中间字符串发生中断：发现了“{”但没有匹配的“}”。"
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "第 %u 条指令中以无效的字符“%c”而非“}”结束。"
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "第 %u 条指令以无效的字符而非“}”结束。"
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr "指令中间开始字符串：发现了“}”但没有匹配的“{”。"
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "第 %u 条指令之后的字符串包含独立的“}”。"
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "第 %u 条指令中，标志组合无效。"
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "第 %u 条指令中，“%c”前不允许有精度。"
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "第 %u 条指令中，精度的参数个数必须是 %u 个。"
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "第 %u 条指令中，“%c”前不允许有精度。"
+
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "第 %u 条指令中，精度指定无效。"
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "第 %u 条指令中，“%c”前不允许有标志。"
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "“msgid”使用了 %%m，但“%s”没有使用"
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "“msgid”没有使用 %%m，但“%s”使用了 %%m"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "字符串于指令中间结束。"
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr "字符串同时使用两种方式引用了参数：绝对参数编号和未编号参数指定符。"
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "第 %u 条指令中，第 0 个参数不是正整数。"
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr "第 %u 条指令中，宽度的第 0 个参数不是正整数。"
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr "第 %u 条指令中，精度的第 0 个参数不是正整数。"
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr "第 %u 条指令中，字符“%c”不是有效的对话指定符。"
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr "终止第 %u 条指令的字符不是有效的转换指示符。"
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "字符串引用第 %u 个参数的方法不兼容。"
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr "第 %u 条指令中，子字符串“%s”不是有效的日期/时间风格。"
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "第 %u 条指令中，“%s”后面没有逗号。"
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "第 %u 条指令中，子字符串“%s”不是有效的数字格式。"
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr "第 %u 条指令中，参数编号后面没有逗号和“%s”、“%s”、“%s”、“%s”之一。"
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr "第 %u 条指令中，选择不包含数字。"
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr "第 %u 条指令中，选择包含的数字后面没有“<”、“#”或“%s”。"
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "“%2$s”参数 {%1$u} 的格式指定符未在“msgid”中找到"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "参数 {%u} 中未在“%s”中找到"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "参数 {%2$u} 在“msgid”和“%1$s”中的格式指定不相同"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr "第 %u 条指令中，第 %u 个参数类型为“%s”，但应为“%s”。"
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -526,215 +534,215 @@ msgid_plural ""
 "u parameters."
 msgstr[0] "第 %u 条指令中，给出的参数太多；最多只需要 %u 个参数。"
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "第 %u 条指令中，“%c”后面没有数字。"
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "第 %u 条指令中，参数 %d 为负数。"
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "字符串在 ~/.../ 指令中间中断。"
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "发现了“~%c”但没有匹配的“~%c”。"
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "第 %u 条指令中，同时给出了 @ 和 : 修饰符。"
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr "第 %u 条指令中，“~:[”后面没有两个用“~;”分隔的子句。"
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "第 %u 条指令中，“~;”的位置无效。"
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "字符串引用某些参数的方式不兼容。"
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "“msgid”和“%s”中的格式指定符不同"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "“%s”中的格式指定符不是“msgid”格式指定符的子集"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr "第 %u 条指令中，大小指定符与转换指定符“%c”不兼容。"
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "参数“%s”的格式指定符未在“%s”中找到"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr "字符串同时使用两种方式引用了参数：通过参数名称和未命名参数指定符。"
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "字符串对名为“%s”的参数引用方式不兼容。"
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 "tuple"
 msgstr "“msgid”中的格式指定符需要映射，而“%s”中的格式指定符需要元组"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 "mapping"
 msgstr "“msgid”中的格式指定符需要元组，而“%s”中的格式指定符需要映射"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "“%2$s”中对参数“%1$s”的格式指定符未在“msgid”中找到"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "“msgid”和“%s”中对参数“%s”的指定符不同"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
-msgstr "对 %%%c 的多重引用。"
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
+msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "字符串以非 ASCII 名称引用 shell 变量。"
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 "字符串引用的 shell 变量中大括号语法过于复杂。为安全起见，此语法不被支持。"
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr "字符串引用的 shell 变量值可能在 shell 函数中有所不同。"
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "字符串以空名称引用 shell 变量。"
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr "第 %u 条指令中，字符“%c”不是介于 1 和 9 之间的数字。"
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr "终止第 %u 条指令的字符不是介于 1 和 9 之间的数字。"
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"版权 (C) %s Free Software Foundation, Inc.\n"
-"本软件是自由软件；请参看源代码中的复制条件。不提供任何形式的担保；对于特定\n"
-"用途也没有商用性或任何保全。\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 编写。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "参数太多"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "试试“%s --help”查看帮助信息。\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "用法：%s [选项]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "打印机器的主机名。\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "输出格式：\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 短主机名\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -742,250 +750,255 @@ msgid ""
 "                                name, and aliases\n"
 msgstr "  -f, --fqdn, --long          长主机名，包括全称域名和别名\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主机名地址\n"
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "信息性输出：\n"
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  显示此帮助并退出\n"
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               输出版本信息并退出\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "将错误报告至 。\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "无法获得主机名"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "允许最多一个输入文件"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 互相排斥"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "用法：%s [选项] [输入文件]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr "根据消息的属性过滤一个翻译库里的消息，并处理消息的属性。\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "长选项必须用的参数在使用短选项时也是必须的。\n"
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "输入文件的位置：\n"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  输入文件                    做为输入的 PO 文件\n"
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=目录        在<目录>中查找输入文件\n"
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果没有指定输入文件或输入文件是 -，则读取标准输入。\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "输出文件位置：\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=文件      将输出写入指定文件\n"
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr "如果没有指定输出文件或输出文件是 -，则将结果写入至标准输出。\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr "消息选择：\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            保留已翻译的，去掉未翻译的消息\n"
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          保留未翻译的，去掉已翻译的消息\n"
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              删除标为模糊的消息\n"
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            保留标为模糊的消息\n"
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           移除过时 #~ 的消息\n"
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         保留过时 #~ 的消息\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "属性操纵：\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             全部消息设为“模糊”\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           全部消息清除“模糊”属性\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          全部消息设为过时\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        全部消息清除过时属性\n"
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           全部消息清除“模糊”属性\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=文件.po     只处理列在 文件.po 中的项\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr "      --ignore-file=文件.po   只处理未列在 文件.po 中的项\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 等于 --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等于 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "输入文件的语法：\n"
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -993,120 +1006,120 @@ msgid ""
 msgstr ""
 "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "输出细节：\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             不在输出中使用 C 转码序列(默认)\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr "  -E, --escape                在输出中使用 C 转码序列，没有扩展字符\n"
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算为空也写入 PO 文件\n"
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                使用缩进风格写入 .po 文件\n"
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           不写入“#: 文件名:行号”位置行\n"
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr "  -n, --add-location          生成“#: 文件名:行号”位置行(默认)\n"
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                写入极为严格的 Uniforum 使 .po 文件保持一致\n"
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     写出 Java .properties 文件\n"
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    写出 NeXTstep/GNUstep .strings 文件\n"
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=数字            设置输出页面宽度\n"
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr "      --no-wrap               不将超过输出页宽度的长消息行断为多行\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           输出前排序\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          按文件位置排序输出\n"
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "不可能出现的选择条件 (%d < n < %d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [选项] [输入文件]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1127,23 +1140,23 @@ msgstr ""
 "选项，那样则会由第一个包含该翻译条目的文件获取数据。所有 PO 文件中的翻译条目\n"
 "的文件位置都会累积下来。\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  输入文件 ...                输入文件\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=文件       由<文件>读入输入文件的列表\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果输入文件为 -，则将读取标准输入。\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1152,7 +1165,7 @@ msgstr ""
 "  -<, --less-than=数字        只打印出现次数少于指定次数的消息，若没有\n"
 "                              指定次数则默认值为无穷大\n"
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1161,7 +1174,7 @@ msgstr ""
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 0\n"
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1170,14 +1183,14 @@ msgstr ""
 "  -u, --unique                --less-than=2 的缩写，要求只列出出现一次\n"
 "                              的消息\n"
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1186,12 +1199,12 @@ msgid ""
 msgstr ""
 "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=名称          输出的编码\n"
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1200,27 +1213,41 @@ msgstr ""
 "      --use-first             对每条消息均使用第一个可用的翻译，不合并若干\n"
 "                              种翻译\n"
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "没有给出输入文件"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "需要两个输入文件"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "用法：%s [选项] def.po ref.pot\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1236,80 +1263,80 @@ msgstr ""
 "此程序可用来检查程序中的所有的消息是否都已经翻译好了。比较时如果\n"
 "有不完全匹配的字符串出现，程序会以模糊配对的方式得出较好的结果。\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      翻译\n"
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     对源文件的引用\n"
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "操作修饰：\n"
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr "  -m, --multi-domain          将 ref.pot 应用到 def.po 的每个域上\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "  -f, --use-fuzzy             在输出中使用模糊的翻译条目\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --untranslated          保留未翻译的，去掉已翻译的消息\n"
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "警告：此消息未使用"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "此消息使用了但却未定义..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...但此定义十分类似"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "此消息已使用，但未定义于 %s 中"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "警告：此消息未使用"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "发现 %d 处致命错误"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "需要至少指定两个文件"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1327,7 +1354,7 @@ msgstr ""
 "息）。翻译内容、自行加上的注释和源程序注释的批注都会保留，但只会保留最先定义\n"
 "这些信息的 PO 文件中的内容。所有 PO 文件中的翻译条目的文件位置都会累积下来。\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1336,67 +1363,67 @@ msgstr ""
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 1\n"
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr "      --omit-header           不写入带有“msgid \"\"”项的文件头项\n"
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "将一个翻译库的编码转换为另一种文字编码。\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr "转换目标：\n"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "默认编码为当前区域设置的编码。\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                缩进的输出风格\n"
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           排除“#: filename:line”行\n"
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          保留“#: filename:line”行(默认)\n"
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                严格的 Uniforum 输出风格\n"
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "没有给出输入文件"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr "需要一个输入文件"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "用法：%s [选项] 输入文件\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1408,22 +1435,22 @@ msgstr ""
 "(通常由 xgettext 创建)。未翻译的条目会填上和 msgid 一样的字符串，\n"
 "并标记为模糊。\n"
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  输入文件                    输入 PO 或 POT 文件\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr "丢失命令名"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "用法：%s [选项] 命令 [命令选项]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1438,7 +1465,7 @@ msgstr ""
 "即是 msgexec 的输出结果。msgexec 的返回值是所有\n"
 "命令调用产生的返回值的最大值。\n"
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1447,42 +1474,42 @@ msgstr ""
 "有一个称为“0”的特殊内置命令，它会输出翻译条目，并随后加上一个 null\n"
 "字节。“msgexec 0”的输出适用于作为“xargs -0”的输入。\n"
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=输入文件        输入的 PO 文件\n"
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr "写入 stdout 失败"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "写入 %s 子进程失败"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr "缺少过滤器名称"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "必须指定至少一个 sed 脚本"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [选项] 过滤器 [过滤器选项]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "对于翻译库中的所有翻译条目进行过滤。\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1491,18 +1518,18 @@ msgstr ""
 "<过滤器>可以是任何由标准输入读入翻译条目\n"
 "并将修改后的翻译写进标准输出的程序。\n"
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "当过滤器是“sed”时可用的过滤选项：\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=脚本       将<脚本>添加到欲执行的命令中\n"
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1510,119 +1537,119 @@ msgid ""
 "                                to be executed\n"
 msgstr "  -f, --file=脚本文件         将<脚本文件>的内容添加到欲执行的命令中\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       禁用对模式空白的自动打印\n"
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr "      --no-escape             在输出中不使用 C 转义字符(默认)\n"
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                缩进的输出风格\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           保持文件头项不变，不过滤它\n"
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr "尚未实现。"
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "无法为 %s 子进程创建非专用的 I/O"
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "和 %s 子进程通讯时出现错误"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "由 %s 子进程读入数据时出现错误"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s 子进程已终止，错误码为 %d"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s 的参数应该是一个标点符号"
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "无效的 endianness：%s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需要指定“-d 目录”选项"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需要指定“-l locale”选项"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 只能配合 %s、%s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d 条已翻译消息"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，%d 条模糊消息"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，%d 条未翻译消息"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [选项] 文件名.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式描述生成二进制消息文件。\n"
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1631,24 +1658,24 @@ msgstr ""
 "长选项必须用的参数在使用短选项时也是必须的。\n"
 "可选参数也是如此。\n"
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  文件名.po ...               输入文件\n"
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr "  -j, --java                  Java 模式：生成 Java 资源包类\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1657,51 +1684,51 @@ msgstr ""
 "      --java2                 类似 --java，但假设是 Java2 (JDK 1.2 或较新\n"
 "                              的版本)\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模式：生成 .NET .dll 文件\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr "      --csharp-resources      C# 资源模式：生成 .NET .resources 文件\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：生成 tcl/msgcat .msg 文件\n"
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模式：生成 Qt .qm 文件\n"
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                使用严格的 Uniforum 模式\n"
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果输出文件是 -，则会将结果写入至标准输出。\n"
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "以 Java 模式输出文件位置：\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=资源         资源名称\n"
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1709,13 +1736,13 @@ msgid ""
 msgstr ""
 "  -l, --locale=语系           语系名称，必须是“语言”或“语言_国家”的格式\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目录                     类目录层次的基本目录\n"
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1726,19 +1753,19 @@ msgstr ""
 "类名称是由资源名称连同语系名称共同决定的，两者之间会用下划线分隔。\n"
 "-d 选项是必须的。class 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "以 C# 模式输出文件位置：\n"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr "  -d 目录                     依赖语系的 .dll 文件的的基本目录\n"
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1747,29 +1774,29 @@ msgstr ""
 "-l 和 -d 选项是必要的。.dll 文件会写入指定目录的子目录，而子目录的名称取决于"
 "语系。\n"
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "以 Tcl 模式输出文件位置：\n"
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  --d 目录                    .msg 消息库的基本目录\n"
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr "-l 和 -d 选项是必要的。所生成的 .msg 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "输入文件的解释：\n"
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1779,19 +1806,19 @@ msgstr ""
 "  -c, --check                 同时进行 --check-format、--check-header 和\n"
 "                                --check-domain 三种检查\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          检查和语言有关的格式字符串\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          检查文件头项是否存在及检查其内容\n"
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1800,7 +1827,7 @@ msgstr ""
 "      --check-domain          检查 domain 指令和 --output-file 选项之间\n"
 "                                是否冲突\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1808,7 +1835,7 @@ msgid ""
 msgstr ""
 "  -C, --check-compatibility   让 GNU msgfmt 以 X/Open msgfmt 的方式检查文件\n"
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1817,110 +1844,110 @@ msgid ""
 msgstr ""
 "      --check-accelerators[=CHAR]  检查菜单项目中的快捷键标记是否存在\n"
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在输出中使用模糊的翻译条目\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=数字        以<数字>个字节为单位对齐字符串(默认：%d)\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               二进制文件将不包含哈希表\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            打印关于翻译的统计\n"
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               增加输出的详细程度\n"
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：PO 文件头丢失或无效\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字符集转换无法工作\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "警告：PO 文件头模糊\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "警告：旧版本的 msgfmt 将在此时给出错误\n"
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "域名“%s”无法用于文件名"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "域名“%s”无法用于文件名：将使用前缀"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "域名“%s”不适合作为文件名"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "忽略了空的“msgstr”项"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "忽略了模糊的“msgstr”项"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：源文件包含模糊的翻译条目"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "读取“%s”出错"
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr "未指定“J”、“K”、“T”、“C”或“X”前不能使用选项“%c”"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr "提取翻译库中的消息，这些消息符合某个给出的模式或属于某个给出的源文件。\n"
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1994,23 +2021,23 @@ msgstr ""
 "  -i, --ignore-case           忽略大小写区别\n"
 "  -v, --invert-match          仅输出不符合任何条件的消息\n"
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr "      --escape                在输出中使用 C 转义字符，没有扩展字符\n"
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           生成排序输出\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          根据文件位置排序输出\n"
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2019,7 +2046,7 @@ msgstr ""
 "系统环境没有任何和语言有关的设置。请根据 ABOUT-NLS 文件所述，\n"
 "设置 LANG 环境变量。这是测试翻译前的必要步骤。\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2030,24 +2057,24 @@ msgstr ""
 "请通过 --locale 选项指定语系或\n"
 "--output-file 选项指定输出的 .po 文件。\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "已创建 %s。\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "创建新的 PO 文件，即根据用户环境取值初始化文件头。\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=输入文件        输入的 POT 文件\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2057,12 +2084,12 @@ msgstr ""
 "如果没有给出输入文件，将会搜索当前目录中的 POT 文件。\n"
 "如果为 - 的话，将会读取标准输入。\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=文件      将输出写入至指定的 PO 文件\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2072,18 +2099,18 @@ msgstr ""
 "定。\n"
 "如果输出文件是“-”，则会将结果写入至标准输出。\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          设置目标语系\n"
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         假定 PO 文件是自动生成的\n"
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2091,12 +2118,12 @@ msgstr ""
 "找到多于一个的 .pot 文件。\n"
 "请通过 --input 选项指定作为输入文件的 .pot 文件。\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "读取当前的目录时发生错误"
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2104,14 +2131,14 @@ msgstr ""
 "在当前目录中找不到任何 .pot 文件。\n"
 "请通过 --input 选项指定作为输入文件的 .pot 文件。\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s 子进程失败，错误码为 %d"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2125,47 +2152,47 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s 软件包的简体中文翻译"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "当前的字符集编码“%s”不是通用的编码名称"
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "输入文件中出现了两种不同的字符集“%s”和“%s”"
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "输入文件“%s”不包含指定字符集的文件头项"
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr "输入文件“%2$s”的域“%1$s”不包含指定字符集的文件头项"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "目标字符集编码“%s”不是通用的编码名称。"
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "警告："
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2174,7 +2201,7 @@ msgstr ""
 "输入文件所用的编码不同，其中包含 UTF-8。\n"
 "输出将转换为 UTF-8。\n"
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2185,7 +2212,7 @@ msgstr ""
 "输入文件包含不同编码的消息，其中包含 %s 和 %s。会将输出的编码转换为 UTF-8。\n"
 "若要选择另一种输出编码，请使用 --to-code 选项。\n"
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2197,7 +2224,7 @@ msgstr ""
 "请将全部的 msgid 和 msgctxt 都转换为纯 ASCII，或者从源代码上保证这些字符串\n"
 "都是 UTF-8 编码的。\n"
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2208,12 +2235,12 @@ msgstr ""
 "当前语系的字符集“%s”和输入文件的字符集“%s”不同。\n"
 "“%s”的输出可能有误。可行的解决方法包含：\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- 将 LC_ALL 设为编码 %s 对应的语系。\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2224,7 +2251,7 @@ msgstr ""
 "   然后应用“%s”命令，\n"
 "   最后用“msgconv”将翻译库的字符集还原为 %s。\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2237,7 +2264,7 @@ msgstr ""
 "   然后应用“%s”命令，\n"
 "   最后用“msgconv”将翻译库的字符集还原为 %s。\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2248,72 +2275,72 @@ msgstr ""
 "“%s”的输出可能有误。\n"
 "设置 LC_ALL=C 是一个可行的解决方法。\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "复数表达式将导致负值"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu，但复数表达式的最大值可能等于 %lu"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "复数表达式将导致被零除"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "复数表达式将引起整数溢出"
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "复数表达式将引起算术异常，可能被零除"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "请尝试使用下面的，对 %s 是有效的："
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr "消息库有复数形式的翻译"
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "但是文件头项中缺少“plural=表达式”属性"
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "但是文件头项中缺少“nplural=整数”属性"
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "nplurals 值无效"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "plural 表达式无效"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "但是某些消息只有 %lu 种复数形式"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "但是某些消息有 %lu 种复数形式"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2321,96 +2348,96 @@ msgstr ""
 "翻译库包含复数形式的翻译，但缺少以下的文件头项：\n"
 "“Plural-Forms: nplurals=<整数>; plural=<表达式>;”"
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "“msgid”和“msgid_plural”项并非同时以“\\n”开始"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "“msgid”和“msgstr[%u]”项并非同时以“\\n”开始"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "“msgid”和“msgstr”项并非同时以“\\n”开始"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "“msgid”和“msgid_plural”项并非同时以“\\n”结束"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "“msgid”和“msgstr[%u]”项并非同时以“\\n”结束"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "“msgid”和“msgstr”项并非同时以“\\n”结束"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "复数处理是 GNU gettext 的扩展功能"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr 缺少快捷键标记“%c”"
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 包含过多的快捷键标记“%c”"
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "头部缺少文件头项“%s”\n"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "文件头项“%s”应该位于行首\n"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "某些文件头项仍然是默认值\n"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "文件头项“%s”仍然是默认值\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s：在“%s”编码中输入无效"
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s：从“%s”编码转换到“%s”编码时出错"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "输入文件不包含指定字符集的文件头项"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr "无法从“%s”转换为“%s”。%s 需要 iconv()，但 iconv() 不支持此种转换方式。"
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr "从“%s”转换为“%s”出现了重复项：某些原本不同的 msgid 变成了相同项。"
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2536,17 +2563,17 @@ msgstr "      --translated            保留已翻译的，去掉未翻译的消
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       隐藏进度指示\n"
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "此消息应定义复数形式"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "此消息不应定义复数形式"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2555,38 +2582,38 @@ msgstr ""
 "%s读取了 %ld 条旧的 + %ld 条引用，合并了 %ld 条，模糊的 %ld 条，缺少 %ld 条，"
 "过时的 %ld 条。\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " 完成。\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s 和明确给定的文件名互相冲突"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "用法：%s [选项] [文件]...\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "将二进制消息库转换为 Uniforum 风格的 .po 文件。\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr "  -j, --java                  Java 模式：输入为 Java 资源包类\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# 模式：输入为 .NET .dll 文件\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2594,23 +2621,23 @@ msgid ""
 msgstr ""
 "      --csharp-resources      C# 资源模式：输入为 .NET .resources 文件\n"
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：输入为 tcl/msgcat .msg 文件\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  文件 ...                    输入的 .mo 文件\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "以 Java 模式输入文件位置：\n"
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2620,12 +2647,12 @@ msgstr ""
 "类名称是由资源名称连同语系名称共同决定的，两者之间会用下划线分隔。\n"
 "类会使用 CLASSPATH 定位。\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# 模式下的输入文件位置：\n"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2634,29 +2661,29 @@ msgstr ""
 "-l 和 -d 选项是必要的。.dll 文件位于指定目录的子目录，而子目录的名称取决于语"
 "系。\n"
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl 模式下的输入文件位置：\n"
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr "-l 和 -d 选项是必要的。所生成的 .msg 文件会存放在指定的目录。\n"
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                写出缩进的输出风格\n"
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                写出严格的 Uniforum 风格\n"
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2675,24 +2702,24 @@ msgstr ""
 "累积起来，但如果指定了 --use-first 选项，则会从第一个翻译中取得注释。文件位置\n"
 "将会累积。如果使用了 --unique 选项，重复项将会被忽略。\n"
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              只打印重复项\n"
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr "  -u, --unique                只打印唯一的消息，忽略重复项\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr ""
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2701,7 +2728,7 @@ msgstr ""
 "字符集“%s”不是可移植的编码名称。\n"
 "将消息转换为用户字符集可能不工作。\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2710,21 +2737,21 @@ msgstr ""
 "不支持“%s”字符集。%s 依赖 iconv()，而 iconv() 不支持\n"
 "“%s”。\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr "安装 GNU libiconv，然后重新安装 GNU gettext 将修复此问题。\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "仍然继续，遇到处理错误。"
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "仍然继续。"
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2733,7 +2760,7 @@ msgstr ""
 "不支持“%s”字符集。%s 依赖 iconv()。\n"
 "此版本创建时未包含 iconv()。\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2741,144 +2768,144 @@ msgstr ""
 "文件头缺少字符集。\n"
 "将消息转换为用户的字符集无法工作。\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "#~ 使用不一致"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "缺少“msgstr[]”区"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "缺少“msgid_plural”区"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "缺少“msgstr”区"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "复数格式的第一项索引非零"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "复数形式的索引出错"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "错误太多，中止"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "无效的多字节序列"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "在文件尾发现不完整的多字节序列"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "在行尾发现不完整的多字节序列"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr "iconv 失败"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "关键字“%s”未知"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "无效的控制序列"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "字符串内遇到文件尾"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "字符串内遇到行尾"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr "上下文分隔符  出现于字符串中"
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此文件可能不包含域指令"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "重复的消息定义"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "这是第一次定义的位置"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "文件“%s”被截断"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "文件“%s”包含非 NUL 结束的字符串"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "文件“%s”不是 GNU .mo 格式"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "文件“%s”包含非 NUL 结尾的字符串，位于 %s"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "警告：Unicode 字符语法 \\uxxxx 无效"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 msgid "warning: unterminated string"
 msgstr "警告：未结束的字符串"
 
 # c-format
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 msgid "warning: syntax error"
 msgstr "警告：语法错误"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
 msgstr "警告：未结束的关键字/值对"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
 msgstr "警告：语法错误，字符串后期待“;”"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "警告：语法错误，字符串后期待“=”或“;”"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "由 %s 和 %s 编写。\n"
@@ -2887,55 +2914,55 @@ msgstr "由 %s 和 %s 编写。\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr "将塞尔维亚语由西里尔文转换为拉丁文。\n"
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr "输入文本从标准输入读取。转换后的文本输出到标准输出。\n"
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "输入无法用“%s”编码表示"
 
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "从“%s”转换为“%s”编码时出错"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr "需要两个参数"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "用法：%s [选项] URL 文件\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr "获取 URL 并输出其内容。如果无法访问 URL，则换用指定的本地文件。\n"
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr "写入 stdout 出错"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2944,20 +2971,20 @@ msgstr ""
 "使用 Java .properties 语法无法将多个翻译域输出到单个文件中。试着换用 PO 文件"
 "语法。"
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr "使用 NeXTstep/GNUstep .strings 语法无法将多个翻译域输出到单个文件中。"
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr "消息库有依赖上下文的翻译，但是输出格式不支持上下文。"
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -2966,70 +2993,63 @@ msgstr ""
 "消息库有复数翻译，但输出格式不支持复数。试着使用“msgfmt --java”生成 Java 类，"
 "而不是 properties 文件。"
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr "消息库有复数翻译，但是输出格式不支持复数处理。"
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "无法创建输出文件“%s”"
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "标准输出"
 
-#: src/write-csharp.c:618
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr ""
-"消息库有依赖上下文的翻译\n"
-"但是 C# .dll 格式不支持上下文\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "创建目录“%s”失败"
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "编译 C# 类失败，试试 --verbose"
 
-#: src/write-java.c:920
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr ""
-"消息库有依赖上下文的翻译\n"
-"但是 Java ResourceBundle 格式不支持上下文\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "编译 C# 类失败，试试 --verbose"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "不是有效的 Java 类名：%s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "编译 Java 类失败，试试 --verbose 或设置 $JAVAC"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr "编译 Java 类失败，试试 --verbose 或设置 $JAVAC"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "打开“%s”写入出错"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "国际化的消息不应包含“\\%c”转码序列"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3042,7 +3062,7 @@ msgstr ""
 "用纯 ASCII 的 msgctxt。\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3055,7 +3075,7 @@ msgstr ""
 "用纯 ASCII 的 msgid。\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3063,7 +3083,7 @@ msgstr ""
 "消息库有复数翻译\n"
 "但是 Qt 消息库不支持复数处理\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
 "1\n"
@@ -3074,7 +3094,7 @@ msgstr ""
 "译\n"
 "后的字符串中支持 Unicode，在翻译前的字符串中不支持\n"
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3083,12 +3103,12 @@ msgstr ""
 "消息库中的 msgid 字符串包含超出 ISO-8859-1 的字符，但 Qt 消息库格式仅在翻译\n"
 "后的字符串中支持 Unicode，在翻译前的字符串中不支持\n"
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "写入 %s 子进程出错"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3096,7 +3116,7 @@ msgstr ""
 "消息库有依赖上下文的翻译\n"
 "但是 C# .resources 格式不支持上下文\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3104,7 +3124,7 @@ msgstr ""
 "消息库有复数翻译\n"
 "但是 C# .resources 格式不支持复数处理\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3112,7 +3132,7 @@ msgstr ""
 "消息库有依赖上下文的翻译\n"
 "但是 Tcl 消息库不支持上下文\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3120,27 +3140,27 @@ msgstr ""
 "消息库有复数翻译\n"
 "但是 Tcl 消息库不支持复数处理\n"
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d：警告：未结束的字符串"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d：警告：未结束的正规表达式"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d：警告：未结束的字符常量"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d：警告：未结束的字符串字面"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3149,7 +3169,7 @@ msgstr ""
 "在 %s%s 出现了非 ASCII 字符串。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3158,7 +3178,7 @@ msgstr ""
 "%s:%d：出现了无效的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3167,7 +3187,7 @@ msgstr ""
 "%s:%d：较长的不完整多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3176,7 +3196,7 @@ msgstr ""
 "%s:%d：文件结尾处出现了不完整的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3185,12 +3205,12 @@ msgstr ""
 "%s:%d：文件结尾处出现了不完整的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d：iconv 失败"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3199,32 +3219,32 @@ msgstr ""
 "%s:%d：无效的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d：警告：无效的 Unicode 字符"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d：警告：未结束的字符串常量"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d：警告：期待“}”却发现了“)”"
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d：警告：期待“)”却发现了“}”"
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu：%s"
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3233,42 +3253,47 @@ msgstr ""
 "不支持“glade”。%s 依赖 expat。\n"
 "此版本创建时未包含 expat。\n"
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d：警告：未结束的字符串"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d：在文件结束符前的任何位置都找不到字符串结束符“%s”"
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d：在 \\x{十六进制数} 处缺少右大括号"
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\l”)"
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\u”)"
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d：“%c”处有无效的变量转义"
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\L”)"
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\U”)"
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3279,7 +3304,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3290,7 +3315,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3301,7 +3326,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3312,7 +3337,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3323,7 +3348,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3334,77 +3359,77 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "未知编码“%s”。先按照 ASCII 处理。"
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d：无效的字符串定义"
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d：# 后面丢失数字"
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d：无效的字符串表达式"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr "%s:%lu：警告：为安全起见，语法 $“...”不被推荐；请换用 eval_gettext"
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "输出写到 stdout 时无法使用 --join-existing"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "没有指定关键字 xgettext 将无法工作"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "警告：文件“%s”扩展名“%s”未知；看作 C 语言"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "从给定的输入文件中提取可翻译的字符串。\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr "  -d, --default-domain=名称   使用<名称.po>输出(而不是 messages.po)\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=文件           将输出写入指定文件\n"
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=目录       输出文件将会存放在<目录>中\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "选择输入文件所用的语言：\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3423,19 +3448,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-源, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的简写\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "默认情况下，所使用的语言是根据输入文件的扩展名猜测的。\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3444,22 +3469,22 @@ msgstr ""
 "      --from-code=名称        输入文件的编码\n"
 "                                (除了 Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "默认情况下，输入文件都认为是纯 ASCII 文件。\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         将消息加入已有文件\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=文件.po  文件.po中的项不提取\n"
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3468,17 +3493,17 @@ msgstr ""
 "  -c, --add-comments[=标记]   在输出文件中放置用<标记>(或类似的关键字\n"
 "                              行)标明的注释块\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "语言特定选项：\n"
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           提取所有字符串\n"
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3492,7 +3517,7 @@ msgstr ""
 "Tcl,\n"
 "                                Perl, PHP, GCC-源, Glade 语言)\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3501,7 +3526,7 @@ msgstr ""
 "  -k, --keyword[=单词]        要查找的额外关键字(不指定<单词>表明不使用\n"
 "                              默认关键字)\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3512,7 +3537,7 @@ msgstr ""
 "标\n"
 "                              志\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3526,60 +3551,75 @@ msgstr ""
 "Tcl,\n"
 "                                Perl, PHP, GCC-源语言)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             理解输入时的 ANSI C 分段\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (仅 C, C++, ObjectiveC 语言)\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    识别 Qt 格式字符串\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (仅 C++ 语言)\n"
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    识别 Qt 格式字符串\n"
+
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 识别 Boost 格式字符串\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 更详细的格式字符串识别结果\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     写出 Java .properties 文件\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=字符串  在输出中设置版权占位符\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr "      --foreign-user          为外语用户省略 FSF 版权\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --copyright-holder=字符串  在输出中设置版权占位符\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  设置报告 msgid 错误的地址\n"
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3587,7 +3627,7 @@ msgid ""
 msgstr ""
 "  -m, --msgstr-prefix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的前缀\n"
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3595,23 +3635,23 @@ msgid ""
 msgstr ""
 "  -M, --msgstr-suffix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的后缀\n"
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr "--flag 参数并非以 <关键字>:<参数编号>:[遍数-]<标志> 的语法给出：%s"
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "标准输入"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s：警告："
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3619,14 +3659,14 @@ msgid ""
 msgstr ""
 "尽管在格式字符串的位置使用，但 %s 仍不是有效的 %s 格式字符串。原因：%s\n"
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr "以所声明的语言 %2$s 来看，%1$s 不是有效的格式字符串。原因：%3$s\n"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3638,7 +3678,7 @@ msgstr ""
 "翻译者无法重新编排参数的顺序。\n"
 "请考虑使用带有命名参数和映射的格式字符串，而不是使用参数数组。\n"
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3648,27 +3688,27 @@ msgstr ""
 "gettext(\"\") 将返回文件头项，而不\n"
 "是空字符串。\n"
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "关键字“%.*s”的参数指定含糊"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少上下文"
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少复数参数上下文"
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "单数和复数的上下文不匹配"
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3679,11 +3719,40 @@ msgstr ""
 "“Makevars”文件，请指定 MSGID_BUGS_ADDRESS 变量；\n"
 "否则，请指定 --msgid-bugs-address 命令行选项。\n"
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "语言“%s”未知"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr "<未命名>"
+
+#~ msgid "Multiple references to %%%c."
+#~ msgstr "对 %%%c 的多重引用。"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "版权 (C) %s Free Software Foundation, Inc.\n"
+#~ "本软件是自由软件；请参看源代码中的复制条件。不提供任何形式的担保；对于特"
+#~ "定\n"
+#~ "用途也没有商用性或任何保全。\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr ""
+#~ "消息库有依赖上下文的翻译\n"
+#~ "但是 C# .dll 格式不支持上下文\n"
+
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr ""
+#~ "消息库有依赖上下文的翻译\n"
+#~ "但是 Java ResourceBundle 格式不支持上下文\n"
diff --git a/gettext-tools/po/zh_TW.po b/gettext-tools/po/zh_TW.po
index e56e96ccf..c93b22667 100644
--- a/gettext-tools/po/zh_TW.po
+++ b/gettext-tools/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2005-12-06 08:31+0800\n"
 "Last-Translator: Abel Cheung \n"
 "Language-Team: Chinese (traditional) \n"
@@ -17,88 +17,89 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnulib-lib/argmatch.c:135
+#: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "%2$s 的參數 %1$s 無效"
 
-#: gnulib-lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "%2$s 的參數 %1$s 不明確"
 
-#: gnulib-lib/argmatch.c:155
+#: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
 msgstr "有效的參數為："
 
-#: gnulib-lib/clean-temp.c:322
+#: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "找不到暫存檔目錄，正嘗試設定 $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:336
+#: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "無法根據目錄名稱樣式 “%s” 建立暫存檔目錄"
 
-#: gnulib-lib/clean-temp.c:432
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "無法產生輸出檔 “%s”"
 
-#: gnulib-lib/clean-temp.c:447
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "無法根據目錄名稱樣式 “%s” 建立暫存檔目錄"
 
-#: gnulib-lib/closeout.c:67
+#: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
 # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format
-#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
-#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
-#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
-#: src/xgettext.c:1782
+#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
+#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
+#: src/xgettext.c:1817
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
 
-#: gnulib-lib/copy-file.c:67
+#: gnulib-lib/copy-file.c:73
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "無法開啟備份檔 “%s” 來寫入內容"
 
-#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, c-format
 msgid "error reading \"%s\""
 msgstr "讀取 “%s” 時發生錯誤"
 
-#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, c-format
 msgid "error writing \"%s\""
 msgstr "寫入 “%s” 時發生錯誤"
 
-#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "完成讀取 “%s” 後發生錯誤"
 
-#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
-#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
-#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
-#: src/read-tcl.c:112 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
+#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
+#: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() 失敗"
 
-#: gnulib-lib/csharpcomp.c:539
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "找不到 C# 編譯器，請安裝 pnet"
 
-#: gnulib-lib/csharpexec.c:344
+#: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "找不到 C# virtual machine，請安裝 pnet"
@@ -107,119 +108,119 @@ msgstr "找不到 C# virtual machine，請安裝 pnet"
 msgid "Unknown system error"
 msgstr "系統出現不明錯誤"
 
-#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
-#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
-#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
+#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
+#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
+#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s 副進程發生錯誤"
 
-#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s：選項 ‘%s’ 不明確\n"
 
-#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s：選項 ‘--%s’ 不可配合參數使用\n"
 
-#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s：選項 ‘%c%s’ 不可配合參數使用\n"
 
-#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
-#: gnulib-lib/getopt.c:995
+#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
+#: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s：選項 ‘%s’ 需要參數\n"
 
-#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s：無法辨識 ‘--%s’ 選項\n"
 
-#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s：無法辨識 ‘%c%s’ 選項\n"
 
-#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s：選項不合法 -- %c\n"
 
-#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s：選項無效 -- %c\n"
 
-#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
-#: gnulib-lib/getopt.c:1066
+#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
+#: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s：選項需要參數 -- %c\n"
 
-#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s：選項 ‘-W %s’ 不明確\n"
 
-#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s：選項 ‘-W %s’ 不可配合參數使用\n"
 
-#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
-#: gnulib-lib/javacomp.c:153
+#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
+#: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
+#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
-#: src/write-java.c:1008
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "無法建立 “%s”"
 
-#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
-#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
-#: src/write-tcl.c:223
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "當寫入檔案 “%s” 時發生錯誤"
 
-#: gnulib-lib/javacomp.c:1795
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "找不到 Java 編譯器，請安裝 gcj 或是設定 $JAVAC 環境變數"
 
-#: gnulib-lib/javaexec.c:418
+#: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "找不到 Java virtual machine，請安裝 gij 或是設定 $JAVA 環境變數"
 
-#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
-#: src/msginit.c:1073
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s 副進程輸出/輸入錯誤"
 
-#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
-#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
+#: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
+#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
-#: gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "無法建立管線"
@@ -243,72 +244,72 @@ msgstr "無法建立管線"
 #. If you don't know what to put here, please see
 #. 
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:245
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:246
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:47
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandle 失敗，錯誤碼為 0x%08x"
 
-#: gnulib-lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 失敗"
 
-#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
-#: gnulib-lib/wait-process.c:367
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s 副進程"
 
-#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s 副進程出現代表嚴重錯誤的訊號 %d"
 
-#: src/format.c:149
+#: src/format.c:143
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr "和 ‘msgid’ 不同，‘%s’ 的 %s 格式字串無效。原因：%s"
 
-#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337
-#: src/format-gcc-internal.c:582 src/format-librep.c:301
-#: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337
-#: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133
+#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "‘%2$s’ 中第 %1$u 個參數的規格在 ‘msgid’ 中並不存在"
 
-#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347
-#: src/format-gcc-internal.c:592 src/format-librep.c:311
-#: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347
-#: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132
+#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
+#: src/format-gcc-internal.c:633 src/format-librep.c:322
+#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
+#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "第 %u 個參數的規格在‘%s’中並不存在"
 
-#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873
-#: src/format-elisp.c:367 src/format-gcc-internal.c:612
-#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597
-#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406
+#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
+#: src/format-elisp.c:378 src/format-gcc-internal.c:653
+#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
+#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "‘msgid’和‘%s’的第 %u 個參數的規格並不相同"
 
-#: src/format-boost.c:427
+#: src/format-boost.c:449
 #, fuzzy, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr "第 %u 個參數結束的不是 ‘}’，而是不合法的字元。"
 
-#: src/format-c.c:177
+#: src/format-c.c:181
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -317,208 +318,215 @@ msgstr ""
 "在第 %u 個參數，‘<’ 之後的關鍵字不是正確的變數規格。如果想獲知正確的變數規格"
 "名稱，請參考 ISO C 99 規格第 7.8.1 節。"
 
-#: src/format-c.c:565
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "在第 %u 個參數，‘<’ 之後的關鍵字後面缺少了 ‘>’。"
 
-#: src/format-c.c:779
+#: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "字串中有提及第 %u 個參數，但忽略了第 %u 個。"
 
-#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "‘msgid’ 和 ‘%s’ 的參數數目不符"
 
-#: src/format-csharp.c:86 src/format-java.c:203
+#: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
 msgstr ""
 
-#: src/format-csharp.c:106
+#: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
 msgstr "在第 %u 個參數，‘,’ 後面的不是數字。"
 
-#: src/format-csharp.c:125 src/format-java.c:190
+#: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
-#: src/format-csharp.c:133
+#: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr "第 %u 個參數結束的字元是 ‘%c’ 而不是 ‘}’。"
 
-#: src/format-csharp.c:134
+#: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr "第 %u 個參數結束的不是 ‘}’，而是不合法的字元。"
 
-#: src/format-csharp.c:152 src/format-java.c:333
+#: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
 
-#: src/format-csharp.c:153
+#: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "第 %u 個參數後出現單獨的 ‘}’。"
 
-#: src/format-gcc-internal.c:245
+#: src/format-gcc-internal.c:253
 #, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
 
-#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
+#: src/format-gcc-internal.c:290
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
 
-#: src/format-gcc-internal.c:314
+#: src/format-gcc-internal.c:332
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "第 %u 個參數中的數字 0 不是正整數。"
 
-#: src/format-gcc-internal.c:376
+#: src/format-gcc-internal.c:396
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
+
+#: src/format-gcc-internal.c:404
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
 
-#: src/format-gcc-internal.c:424
+#: src/format-gcc-internal.c:459
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:630
+#: src/format-gcc-internal.c:671
 #, c-format
 msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "‘msgid’ 使用了 %%m 但 ‘%s’ 沒有。"
 
-#: src/format-gcc-internal.c:633
+#: src/format-gcc-internal.c:674
 #, c-format
 msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "‘msgid’ 沒有使用 %%m 但 ‘%s’ 有使用 %%m。"
 
-#: src/format-invalid.h:23
+#: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr "在參數中間，字串突然結束"
 
-#: src/format-invalid.h:26
+#: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr "字串中同時出現了有硬性規定和沒有硬性規定位置的參數"
 
-#: src/format-invalid.h:29
+#: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "第 %u 個參數中的數字 0 不是正整數。"
 
-#: src/format-invalid.h:31
+#: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
 
-#: src/format-invalid.h:33
+#: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
 
-#: src/format-invalid.h:37
+#: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr "第 %u 個參數的 ‘%c’ 字元屬於無效的列印格式。"
 
-#: src/format-invalid.h:38
+#: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr "用來結束第 %u 個參數的字元屬於無效的列印格式。"
 
-#: src/format-invalid.h:41
+#: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr "字串採用了不相容的方法來表示第 %u 個參數。"
 
-#: src/format-java.c:237
+#: src/format-java.c:240
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr "第 %u 個參數的子字串 “%s” 是無效的日期/時間格式。"
 
-#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
+#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
 msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
 
-#: src/format-java.c:269
+#: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
 
-#: src/format-java.c:314
+#: src/format-java.c:323
 #, c-format
 msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
 
-#: src/format-java.c:558
+#: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
 msgstr ""
 
-#: src/format-java.c:569
+#: src/format-java.c:583
 #, c-format
 msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
 
-#: src/format-java.c:729
+#: src/format-java.c:745
 #, c-format
 msgid ""
 "a format specification for argument {%u}, as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "‘%2$s’ 中的參數 {%1$u} 的格式在 ‘msgid’ 中並不存在"
 
-#: src/format-java.c:739
+#: src/format-java.c:755
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "參數 {%u} 的規格在 ‘%s’ 中並不存在"
 
-#: src/format-java.c:759
+#: src/format-java.c:775
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "‘msgid’ 和 ‘%s’ 的參數 {%u} 規格並不相同"
 
-#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
-#: src/format-scheme.c:2390
+#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
+#: src/format-scheme.c:2375
 #, c-format
 msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
 
-#: src/format-lisp.c:2387 src/format-scheme.c:2413
+#: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
@@ -529,82 +537,82 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/format-lisp.c:2502 src/format-scheme.c:2505
+#: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr ""
 
-#: src/format-lisp.c:2700 src/format-scheme.c:2715
+#: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr ""
 
-#: src/format-lisp.c:2762
+#: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr ""
 
-#: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131
-#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790
-#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204
+#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
+#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
+#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "找到 ‘~%c’ 但沒有 ‘~%c’ 配合。"
 
-#: src/format-lisp.c:2808 src/format-scheme.c:2806
+#: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
 
-#: src/format-lisp.c:2906 src/format-scheme.c:2904
+#: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
 
-#: src/format-lisp.c:3214 src/format-scheme.c:3163
+#: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr ""
 
-#: src/format-lisp.c:3300 src/format-scheme.c:3238
+#: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
-#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "‘msgid’ 和 ‘%s’ 的參數規格並非同等"
 
-#: src/format-lisp.c:3358 src/format-scheme.c:3296
+#: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "‘%s’ 的參數規格並非 ‘msgid’ 的參數規格的一部份"
 
-#: src/format-perl.c:426
+#: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:194 src/format-python.c:443 src/format-sh.c:295
+#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "參數 ‘%s’ 的規格在 ‘%s’ 中並不存在"
 
-#: src/format-python.c:113
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:327
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:403
+#: src/format-python.c:419
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
@@ -612,7 +620,7 @@ msgid ""
 msgstr ""
 "‘msgid’ 裡的規格對應的是雜湊表 (mapping)，而 ‘%s’ 的卻是固定有序列 (tuple)"
 
-#: src/format-python.c:410
+#: src/format-python.c:426
 #, c-format
 msgid ""
 "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
@@ -620,126 +628,126 @@ msgid ""
 msgstr ""
 "‘msgid’ 裡的規格對應的是固定有序列 (tuple)，而 ‘%s’ 的卻是雜湊表 (mapping)"
 
-#: src/format-python.c:433 src/format-sh.c:285
+#: src/format-python.c:449 src/format-sh.c:297
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
 "'msgid'"
 msgstr "‘%2$s’ 中的參數 ‘%1$s’ 的格式在 ‘msgid’ 中並不存在"
 
-#: src/format-python.c:463
+#: src/format-python.c:479
 #, c-format
 msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "‘msgid’和‘%s’的參數‘%s’的格式並不相同"
 
-#: src/format-qt.c:78
+#: src/format-qt.c:152
 #, c-format
-msgid "Multiple references to %%%c."
+msgid ""
+"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
+"or a double-digit argument number"
 msgstr ""
 
-#: src/format-sh.c:80
+#: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
 msgstr "字串中的 shell 變數名稱含有不屬於 ASCII 的字元。"
 
-#: src/format-sh.c:82
+#: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
 "字串中的 shell 變數名稱含有較複雜的括號格式，因安全理由，這種格式不會支援。"
 
-#: src/format-sh.c:84
+#: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
 msgstr ""
 
-#: src/format-sh.c:86
+#: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
 msgstr "字串中的 shell 變數沒有名稱。"
 
-#: src/format-ycp.c:83
+#: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr "第 %u 個參數的字元‘%c’不是 1 至 9 之間的整數。"
 
-#: src/format-ycp.c:84
+#: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 msgstr "第 %u 個參數最後一個字元不是 1 至 9 之間的整數。"
 
-#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
-#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
-#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
-#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
+#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"版權所有 (C) %s Free Software Foundation, Inc.\n"
-"這是自由軟體；請參考原始碼的版權聲明。本軟體不提供任何保證，甚至不會包括\n"
-"可售性或適用於任何特定目的的保證。\n"
 
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
-#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
-#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
-#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
-#: src/xgettext.c:522
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
+#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
+#: src/xgettext.c:536
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 編寫。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
-#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
-#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
-#: src/urlget.c:137
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
+#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/urlget.c:136
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "參數過多"
 
-#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
-#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
-#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
-#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
+#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "請執行 ‘%s --help’ 顯示額外資訊。\n"
 
-#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "用法：%s [選項]\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "列印主機的名稱。\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
 msgstr "輸出格式：\n"
 
-#: src/hostname.c:221
+#: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 短的主機名稱\n"
 
-#: src/hostname.c:223
+#: src/hostname.c:222
 #, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
@@ -748,250 +756,255 @@ msgid ""
 msgstr ""
 "  -f, --fqdn, --long          長的主機名稱，包括正式的網域名稱(FQDN)及別名\n"
 
-#: src/hostname.c:226
+#: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主機的 IP 地址\n"
 
-#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
-#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
-#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
-#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
+#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "顯示資訊：\n"
 
-#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
-#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
-#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
-#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
+#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  顯示本訊息，然後結束\n"
 
-#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
-#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
-#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
-#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
+#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               顯示版本資訊，然後結束\n"
 
-#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
-#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
-#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
-#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
+#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
 msgid "Report bugs to .\n"
 msgstr "請向  匯報錯誤。\n"
 
-#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
+#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "無法取得主機名稱"
 
-#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
-#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "最多只接受一個輸入檔"
 
-#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
-#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
-#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
-#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
+#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
+#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
+#: src/xgettext.c:563
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 兩者是互不相容的"
 
-#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "用法：%s [選項] [輸入檔]\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:400
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr "根據訊息的屬性過濾翻譯檔裡的條目，並處理這些屬性。\n"
 
-#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
-#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
-#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
-#: src/msguniq.c:330
+#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "長選項必須用的參數在使用短選項時也是必須的。\n"
 
-#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
-#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
-#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
-#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
+#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
+#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
 #, c-format
 msgid "Input file location:\n"
 msgstr "輸入檔位置：\n"
 
-#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   用作輸入的 PO 檔\n"
 
-#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
-#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
-#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
-#: src/xgettext.c:762
+#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
+#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
+#: src/xgettext.c:782
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=目錄        搜尋輸入檔時加入指定<目錄>\n"
 
-#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
-#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果沒有指定輸入檔或輸入檔是 ‘-’，則由標準輸入讀取內容。\n"
 
-#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
-#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
-#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
-#: src/xgettext.c:767
+#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:787
 #, c-format
 msgid "Output file location:\n"
 msgstr "輸出檔位置：\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
-#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
-#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
+#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=檔案      將輸出的內容寫入指定<檔案>\n"
 
-#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
-#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
-#: src/msgunfmt.c:482 src/msguniq.c:346
+#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr "如果沒有指定<輸出檔>或<輸出檔>是 ‘-’，則會在標準輸出顯示結果。\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr "篩選訊息：\n"
 
-#: src/msgattrib.c:427
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
 
-#: src/msgattrib.c:429
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          只保留未翻譯條目，刪除已翻譯條目\n"
 
-#: src/msgattrib.c:431
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              刪除加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:433
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            只保留加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:435
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           刪除過時的條目 (#~)\n"
 
-#: src/msgattrib.c:437
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         只保留過時的條目 (#~) \n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "處理屬性：\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             將所有條目標記為 'fuzzy'\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          將所有條目標記為過時\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        清除所有條目的過時標記\n"
 
-#: src/msgattrib.c:450
+#: src/msgattrib.c:449
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=FILE.po     只處理 FILE.po 裡已經有的條目\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr "      --ignore-file=FILE.po   只處理 FILE.po 裡沒有的條目\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 等於 --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等於 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
-#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
-#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
-#: src/msguniq.c:357
+#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
+#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "輸入檔格式：\n"
 
-#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
-#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
+#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      以 Java .properties 格式處理輸入檔\n"
 
-#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
-#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
+#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -999,17 +1012,17 @@ msgid ""
 msgstr ""
 "      --stringtable-input     以 NeXTstep/GNUstep .strings 格式處理輸入檔\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
-#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
-#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
-#: src/xgettext.c:846
+#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:870
 #, c-format
 msgid "Output details:\n"
 msgstr "輸出內容細節：\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
-#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
-#: src/xgettext.c:848
+#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:872
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1017,9 +1030,9 @@ msgstr ""
 "  -e, --no-escape             輸出結果不使用 C 轉義控制序列\n"
 "                              (escape sequence)，這是預設運作方式\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
-#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
-#: src/msguniq.c:373 src/xgettext.c:850
+#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:874
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1028,66 +1041,66 @@ msgstr ""
 "sequence)\n"
 "                              ，而不使用非 ASCII 字元\n"
 
-#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
-#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
-#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
+#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算沒有內容仍產生 PO 檔\n"
 
-#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
-#: src/xgettext.c:854
+#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                寫入的 .po 檔內容會進行縮排\n"
 
-#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
-#: src/xgettext.c:856
+#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           不加入類似 '#: 檔案:行號' 的源代碼位置\n"
 
-#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
-#: src/xgettext.c:858
+#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          會加入 '#: 檔案:行號' 格式的源代碼位置 (預設)\n"
 
-#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
-#: src/xgettext.c:860
+#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                產生的 .po 檔內容跟隨嚴格的 Uniforum 格式\n"
 
-#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
-#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
-#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
+#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output    產生 Java .properties 檔案\n"
 
-#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
-#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
-#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
+#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    產生 NeXTstep/GNUstep .strings 檔案\n"
 
-#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
-#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
-#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
+#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          指定輸出檔每行寬度\n"
 
-#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
-#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
-#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
+#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1095,31 +1108,31 @@ msgid ""
 msgstr ""
 "      --no-wrap               即使輸出的訊息超出頁寬，也不將輸出的訊息斷行\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
-#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
-#: src/msguniq.c:394 src/xgettext.c:871
+#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:895
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           將輸出結果排序\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
-#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
-#: src/xgettext.c:873
+#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
+#: src/xgettext.c:897
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          根據檔案位置排列輸出結果\n"
 
-#: src/msgcat.c:296 src/msgcomm.c:315
+#: src/msgcat.c:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "不可能出現的選擇條件 (%d < n <%d)"
 
-#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [選項] [輸入檔]...\n"
 
-#: src/msgcat.c:342
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1140,23 +1153,23 @@ msgstr ""
 "--use-first 選項，那樣則會由第一個含有該翻譯條目的檔案取得資料。\n"
 "所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
 
-#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               輸入檔\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       由 FILE 讀取所有輸入檔的位置\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
-#: src/xgettext.c:764
+#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果輸入檔是 - 的話，會由標準輸入讀取資料。\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:387
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1165,7 +1178,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      當一項條目的不同翻譯少於多少種就會顯示，\n"
 "                              預設為無限 (即顯示所有條目)\n"
 
-#: src/msgcat.c:381
+#: src/msgcat.c:398
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1174,7 +1187,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      當一項條目的不同翻譯多於多少種才會顯示，\n"
 "                              預設為 0 種 (即顯示所有條目)\n"
 
-#: src/msgcat.c:384 src/msgcomm.c:393
+#: src/msgcat.c:401 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1183,14 +1196,14 @@ msgstr ""
 "  -u, --unique                等於 --less-than=2，表示只顯示\n"
 "                              只有一種翻譯的字句\n"
 
-#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
 #: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      輸入檔格式為 Java .properties 格式\n"
 
-#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
 #: src/msgmerge.c:532
 #, c-format
 msgid ""
@@ -1199,12 +1212,12 @@ msgid ""
 msgstr ""
 "      --stringtable-input     輸入檔格式為 NeXTstep/GNUstep .strings 格式\n"
 
-#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
+#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=名稱          輸出的編碼\n"
 
-#: src/msgcat.c:400 src/msguniq.c:368
+#: src/msgcat.c:417 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1213,27 +1226,41 @@ msgstr ""
 "      --use-first             每句只使用第一個出現的翻譯，而不會將所有\n"
 "                              翻譯合併起來\n"
 
+#: src/msgcat.c:420
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgcat.c:424
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
+#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:179 src/msgmerge.c:339
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "未指定輸入檔"
 
-#: src/msgcmp.c:184 src/msgmerge.c:344
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "需要恰好指定兩個輸入檔"
 
-#: src/msgcmp.c:203 src/msgmerge.c:453
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "用法：%s [選項] def.po ref.pot\n"
 
-#: src/msgcmp.c:208
+#: src/msgcmp.c:207
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1249,22 +1276,22 @@ msgstr ""
 "此程式可用來檢查程式中的所有的訊息是否都已經翻譯好了。比較時如果\n"
 "有不完全配合的字串出現，程式會以模糊配對的方式得出較好的結果。\n"
 
-#: src/msgcmp.c:222
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      翻譯檔\n"
 
-#: src/msgcmp.c:224
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     未翻譯檔案\n"
 
-#: src/msgcmp.c:229 src/msgmerge.c:519
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "運作模式有關選項：\n"
 
-#: src/msgcmp.c:231 src/msgmerge.c:521
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1272,58 +1299,58 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          將 ref.pot 套用於 def.po 中的每一個領域\n"
 
-#: src/msgcmp.c:233
+#: src/msgcmp.c:232
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "  -f, --use-fuzzy             在輸出結果中顯示模糊翻譯\n"
 
-#: src/msgcmp.c:235
+#: src/msgcmp.c:234
 #, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --untranslated          只保留未翻譯條目，刪除已翻譯條目\n"
 
-#: src/msgcmp.c:306
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "警告：沒有使用這個訊息"
 
-#: src/msgcmp.c:312
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:328 src/msgmerge.c:1214
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "這個訊息有使用過但沒有定義..."
 
-#: src/msgcmp.c:331 src/msgmerge.c:1217
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...但這個定義很相似"
 
-#: src/msgcmp.c:336 src/msgmerge.c:1245
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "這個訊息有使用過但在 %s 中沒有定義"
 
-#: src/msgcmp.c:440
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "警告：沒有使用這個訊息"
 
-#: src/msgcmp.c:447 src/msgfmt.c:543
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "找到 %d 個嚴重錯誤"
 
-#: src/msgcomm.c:304
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "必須指定至少兩個檔案"
 
-#: src/msgcomm.c:352
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1341,7 +1368,7 @@ msgstr ""
 "訊息）。翻譯內容、自行加上的註解和原程式碼的註解都會保留，但只會由第一個\n"
 "含有該翻譯條目的檔案取得。所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
 
-#: src/msgcomm.c:390
+#: src/msgcomm.c:389
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1349,67 +1376,67 @@ msgid ""
 msgstr ""
 "  ->, --more-than=NUMBER      顯示出現多於指定次數的字句，預設為 1 次\n"
 
-#: src/msgcomm.c:434 src/xgettext.c:875
+#: src/msgcomm.c:433 src/xgettext.c:899
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr "      --omit-header           不顯示標頭 (即 ‘msgid \"\"’ 項目)\n"
 
-#: src/msgconv.c:295
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "將一個翻譯檔的編碼轉換為另一種文字編碼。\n"
 
-#: src/msgconv.c:319
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr "轉換目標：\n"
 
-#: src/msgconv.c:323
+#: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "預設的編碼為目前語言的編碼。\n"
 
-#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                將輸出結果進行縮排\n"
 
-#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
 #: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           不輸出源代碼位置\n"
 
-#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
 #: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          保留源代碼位置 (預設)\n"
 
-#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
 #: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                嚴格遵從 Uniforum 格式\n"
 
-#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
+#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "未指定輸入檔"
 
-#: src/msgen.c:234
+#: src/msgen.c:233
 #, c-format
 msgid "exactly one input file required"
 msgstr "需要恰好指定一個輸入檔"
 
-#: src/msgen.c:275
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "用法：%s [選項] 輸入檔\n"
 
-#: src/msgen.c:280
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1420,22 +1447,22 @@ msgstr ""
 "產生英文翻譯檔。輸入檔可以是 PO 檔或 POT 檔 (通常由 xgettext 產生)。\n"
 "未翻譯的條目會填上和 msgid 一樣的字串。\n"
 
-#: src/msgen.c:292
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  輸入檔                      作為輸入的 PO 或 POT 檔\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr "缺少了指令名稱"
 
-#: src/msgexec.c:241
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "用法：%s [選項] 指令 [指令選項]\n"
 
-#: src/msgexec.c:246
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1450,7 +1477,7 @@ msgstr ""
 "即是 msgexec 的輸出結果。msgexec 的回傳值是所有\n"
 "指令執行的回傳值的最大值。\n"
 
-#: src/msgexec.c:255
+#: src/msgexec.c:254
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1459,42 +1486,42 @@ msgstr ""
 "有一個稱為 '0' 的特殊內置指令，它會輸出所有翻譯條目，並隨後加上 null 位元。\n"
 "“msgexec 0” 的輸出適用於作為 “xargs -0” 的輸入。\n"
 
-#: src/msgexec.c:265 src/msgfilter.c:413
+#: src/msgexec.c:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       作為輸入的 PO 檔\n"
 
-#: src/msgexec.c:325
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr "寫入至標準輸出時發生錯誤"
 
-#: src/msgexec.c:352 src/msgfilter.c:665
+#: src/msgexec.c:355 src/msgfilter.c:664
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "寫入至 %s 副進程時發生錯誤"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:296
 #, c-format
 msgid "missing filter name"
 msgstr "未指定過濾器"
 
-#: src/msgfilter.c:325
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "必須指定至少一個 sed script"
 
-#: src/msgfilter.c:400
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [選項] 過濾器 [過濾器選項]\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "對於翻譯檔中的所有翻譯條目進行過濾。\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1503,18 +1530,18 @@ msgstr ""
 "<過濾器>可以是任何由標準輸入讀入翻譯條目\n"
 "並將修改後的翻譯寫進標準輸出的程式。\n"
 
-#: src/msgfilter.c:433
+#: src/msgfilter.c:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "當<過濾器>是 ‘sed’ 時一些比較有用的選項：\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1522,13 +1549,13 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       不會自動顯示過濾後的結果\n"
 
-#: src/msgfilter.c:452 src/msggrep.c:578
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1536,124 +1563,124 @@ msgstr ""
 "      --no-escape             輸出結果不使用 C 轉義控制序列\n"
 "                              (escape sequence)，這是預設運作方式\n"
 
-#: src/msgfilter.c:458 src/msggrep.c:584
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                將輸出結果進行縮排\n"
 
-#: src/msgfilter.c:460
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           保護標頭內容，過濾內容時不會被更改\n"
 
-#: src/msgfilter.c:588
+#: src/msgfilter.c:587
 #, c-format
 msgid "Not yet implemented."
 msgstr "功能尚未編寫。"
 
-#: src/msgfilter.c:617
+#: src/msgfilter.c:616
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "無法和 %s 副進程建立非專用的 I/O"
 
-#: src/msgfilter.c:645
+#: src/msgfilter.c:644
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "和 %s 副進程溝通時出現錯誤"
 
-#: src/msgfilter.c:696
+#: src/msgfilter.c:695
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "由 %s 副進程讀入資料時出現錯誤"
 
-#: src/msgfilter.c:712
+#: src/msgfilter.c:711
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s 副進程已終止，錯誤碼為 %d"
 
-#: src/msgfmt.c:305
+#: src/msgfmt.c:302
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s 的參數應該是一個標點符號"
 
-#: src/msgfmt.c:352
+#: src/msgfmt.c:349
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
+#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
-#: src/msgunfmt.c:342
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需要指定 “-d 目錄” 選項"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需要指定 “-l locale” 選項"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 只能配合 %s、%s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:601
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "已翻譯 %d 個條目"
 
-#: src/msgfmt.c:606
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，有 %d 個條目標記為模糊翻譯"
 
-#: src/msgfmt.c:611
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，還有 %d 個條目未翻譯"
 
-#: src/msgfmt.c:631
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [選項] filename.po ...\n"
 
-#: src/msgfmt.c:635
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式翻譯檔產生二元碼翻譯檔。\n"
 
-#: src/msgfmt.c:640 src/xgettext.c:751
+#: src/msgfmt.c:638 src/xgettext.c:771
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr "長選項必要的參數在使用短選項時也是必要的。對於選擇性的參數也一樣。\n"
 
-#: src/msgfmt.c:647
+#: src/msgfmt.c:645
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             輸入檔\n"
 
-#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
+#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1661,7 +1688,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  Java 模式：產生 Java ResourceBundle class\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1670,12 +1697,12 @@ msgstr ""
 "      --java2                 類似 --java，假設格式為 Java2 (JDK 1.2 或以"
 "上)\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模式，會產生 .NET .dll 檔\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1684,39 +1711,39 @@ msgstr ""
 "      --csharp-resources      C# resources 模式，會產生 .NET .resources 檔"
 "案\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：產生 tcl/msgcat .msg 檔\n"
 
-#: src/msgfmt.c:666
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模式：產生 Qt .qm 檔\n"
 
-#: src/msgfmt.c:673
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                強制使用 Uniforum 格式翻譯檔\n"
 
-#: src/msgfmt.c:675 src/xgettext.c:775
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果輸出檔是 - 的話，則會在標準輸出顯示結果。\n"
 
-#: src/msgfmt.c:678
+#: src/msgfmt.c:676
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
+#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource 名稱\n"
 
-#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
-#: src/msgunfmt.c:460 src/msgunfmt.c:470
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1725,13 +1752,13 @@ msgstr ""
 "  -l, --locale=LOCALE         指定語言，可以用語言名稱或者 xy_XY 格式的\n"
 "                              語言代號\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目錄                     class 目錄層的基本目錄\n"
 
-#: src/msgfmt.c:686
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1742,48 +1769,48 @@ msgstr ""
 "class 名稱是由語言名稱和 resource 名稱合併來決定的，兩者之間會用底線分隔。\n"
 "-d 選項是必須的。class 檔會存放在指定的目錄。\n"
 
-#: src/msgfmt.c:692
+#: src/msgfmt.c:690
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:698 src/msgunfmt.c:462
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:700
+#: src/msgfmt.c:698
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:704
+#: src/msgfmt.c:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:708 src/msgunfmt.c:472
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:710
+#: src/msgfmt.c:708
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:722 src/xgettext.c:791
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "輸入檔處理：\n"
 
-#: src/msgfmt.c:724
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1794,19 +1821,19 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          檢查各種程式語言的格式字串\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          確保標頭欄位存在和內容正確\n"
 
-#: src/msgfmt.c:731
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1815,7 +1842,7 @@ msgstr ""
 "      --check-domain          檢查 domain 關鍵字和 --output-file 選項之間\n"
 "                                有沒有衝突\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1824,7 +1851,7 @@ msgstr ""
 "  -C, --check-compatibility   確保 GNU msgfmt 運作的方式和 X/Open msgfmt 兼"
 "容\n"
 
-#: src/msgfmt.c:736
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1832,111 +1859,111 @@ msgid ""
 "                                menu items\n"
 msgstr "      --check-accelerators[=CHAR]  檢查選單項目中代表捷徑鍵的字元\n"
 
-#: src/msgfmt.c:739
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在輸出結果中顯示模糊翻譯\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=數字        以<數字>個位元組為單位配置字串位置(預設：%d)\n"
 
-#: src/msgfmt.c:746
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               二元碼檔不會包含雜湊表 (hash table) 在內\n"
 
-#: src/msgfmt.c:755
+#: src/msgfmt.c:753
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            顯示有關翻譯訊息的統計\n"
 
-#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
+#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               顯示詳細資訊\n"
 
-#: src/msgfmt.c:867
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：缺少了 PO 檔的標頭或是格式無效\n"
 
-#: src/msgfmt.c:870
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字元集轉換的功能不會生效\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "警告：PO 檔的標頭仍然是模糊狀態\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "警告：較舊版本的 msgfmt 遇到此檔案時會印出錯誤訊息\n"
 
-#: src/msgfmt.c:906
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "領域名稱 “%s” 不適合作為檔案名稱"
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "領域名稱 “%s” 不適合作為檔案名稱：將使用字首"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:927
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "忽略‘domain %s’指令"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:987
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "忽略空的‘msgstr’欄位"
 
-#: src/msgfmt.c:986
+#: src/msgfmt.c:988
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "忽略模糊的‘msgstr’欄位"
 
-#: src/msgfmt.c:1035
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：原始檔包含模糊翻譯條目"
 
-#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
-#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
-#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
-#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176
-#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
+#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
+#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
+#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
+#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
+#: src/x-tcl.c:151 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "讀取 “%s” 時出現錯誤"
 
-#: src/msggrep.c:485
+#: src/msggrep.c:484
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr "未指定 ‘K’、‘T’ 或 ‘C’ 選項前不能使用選項 ‘%c’"
 
-#: src/msggrep.c:505
+#: src/msggrep.c:504
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr "抽取翻譯檔中的訊息，而這些訊息符合某種樣式或屬於某個指定的來源檔。\n"
 
-#: src/msggrep.c:531
+#: src/msggrep.c:530
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2005,7 +2032,7 @@ msgstr ""
 "  -f, --file=FILE             PATTERN 採用 FILE 的內容 \n"
 "  -i, --ignore-case           不區分大小寫\n"
 
-#: src/msggrep.c:580
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2014,17 +2041,17 @@ msgstr ""
 "sequence)\n"
 "                              ，而不使用非 ASCII 字元\n"
 
-#: src/msggrep.c:601
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           將訊息排序\n"
 
-#: src/msggrep.c:603
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          根據檔案位置排序\n"
 
-#: src/msginit.c:288
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2033,7 +2060,7 @@ msgstr ""
 "系統環境沒有任何和語言有關的設定。請根據 ABOUT-NLS 檔案所述，\n"
 "設定 LANG 環境變數。這是測試翻譯時的必要步驟。\n"
 
-#: src/msginit.c:312
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2044,24 +2071,24 @@ msgstr ""
 "請透過 --locale 選項指定語系或\n"
 "--output-file 選項指定輸出的 .po 檔。\n"
 
-#: src/msginit.c:338
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "已建立 %s。\n"
 
-#: src/msginit.c:358
+#: src/msginit.c:355
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "建立新的 PO 檔，並由使用者環境取得初始化所需的檔頭資料。\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=輸入檔          輸入的 POT 檔\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2071,12 +2098,12 @@ msgstr ""
 "如果沒有指定輸入檔，會在目前的目錄搜尋 POT 檔。\n"
 "如果輸入檔是 -，則讀取標準輸入的內容。\n"
 
-#: src/msginit.c:376
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      將輸出的內容寫入指定的 PO 檔\n"
 
-#: src/msginit.c:378
+#: src/msginit.c:375
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2085,18 +2112,18 @@ msgstr ""
 "如果沒有指定輸出檔，檔名將會由 --locale 選項或使用者的語系決定。\n"
 "如果輸出檔是 -，則會將結果寫至標準輸出。\n"
 
-#: src/msginit.c:391
+#: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          指定地區設定\n"
 
-#: src/msginit.c:393
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         假設 PO 檔是自動產生的\n"
 
-#: src/msginit.c:449
+#: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2104,12 +2131,12 @@ msgstr ""
 "找到多於一個的 .pot 檔。\n"
 "請透過 --input 選項指定作為輸入檔的 .pot 檔。\n"
 
-#: src/msginit.c:457 src/msginit.c:462
+#: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr "讀取目前的目錄時發生錯誤"
 
-#: src/msginit.c:470
+#: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2117,14 +2144,14 @@ msgstr ""
 "在目前目錄中找不到任何 .pot 檔。\n"
 "請透過 --input 選項指定作為輸入檔的 .pot 檔。\n"
 
-#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
-#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
-#: src/read-tcl.c:128 src/write-resources.c:105
+#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
+#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
+#: src/read-tcl.c:126 src/write-resources.c:103
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s 副進程失敗，錯誤碼為 %d"
 
-#: src/msginit.c:1051
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2138,47 +2165,47 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1438
+#: src/msginit.c:1465
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traditional Chinese translation for %s"
 
-#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
+#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "目前的字元集編碼 “%s” 不是通用的編碼名稱"
 
-#: src/msgl-cat.c:190 src/msgl-iconv.c:238
+#: src/msgl-cat.c:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "輸入檔有兩種不同的字元集編碼 “%s” 和 “%s”"
 
-#: src/msgl-cat.c:205
+#: src/msgl-cat.c:202
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "輸入檔‘%s’的標頭欄位中沒有指定字元集"
 
-#: src/msgl-cat.c:209
+#: src/msgl-cat.c:206
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr "輸入檔 ‘%2$s’ 的 domain “%1$s” 的標頭欄位中沒有指定字元集"
 
-#: src/msgl-cat.c:392 src/msgl-iconv.c:343
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "目標的字元集編碼 “%s” 不是通用的編碼名稱。"
 
-#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
-#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2778
+#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
+#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2827
 #, c-format
 msgid "warning: "
 msgstr "警告："
 
-#: src/msgl-cat.c:444
+#: src/msgl-cat.c:440
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2186,7 +2213,7 @@ msgid ""
 msgstr ""
 "輸入檔含有不同編碼的訊息，其中一種是 UTF-8。會將輸出的編碼轉換為 UTF-8。\n"
 
-#: src/msgl-cat.c:450
+#: src/msgl-cat.c:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2197,7 +2224,7 @@ msgstr ""
 "輸入檔含有不同編碼的訊息，其中包括 %s 和 %s。會將輸出的編碼轉換為 UTF-8。\n"
 "若要選擇另一種輸出編碼，請使用 --to-code 選項。\n"
 
-#: src/msgl-cat.c:489
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2206,7 +2233,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:95
+#: src/msgl-charset.c:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2218,12 +2245,12 @@ msgstr ""
 "‘%s’的輸出可能有誤。\n"
 "可行的解決方法包括：\n"
 
-#: src/msgl-charset.c:102
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- 設定 LC_ALL 環境變數為使用編碼 %s 的語系。\n"
 
-#: src/msgl-charset.c:107
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2234,7 +2261,7 @@ msgstr ""
 "  然後套用 ‘%s’ 指令過濾內容，\n"
 "  最後再用 ‘msgconv’ 將翻譯檔的字元集還原為 %s。\n"
 
-#: src/msgl-charset.c:116
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2247,7 +2274,7 @@ msgstr ""
 "  然後套用 ‘%s’ 指令過濾內容，\n"
 "  最後再用 ‘msgconv’ 將翻譯檔的字元集還原為 %s。\n"
 
-#: src/msgl-charset.c:130
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2258,75 +2285,75 @@ msgstr ""
 "‘%s’ 的輸出可能有誤。\n"
 "設定 LC_ALL=C 是一個可行的解決方法。\n"
 
-#: src/msgl-check.c:92
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr "複數表示式可能產生負數"
 
-#: src/msgl-check.c:102
+#: src/msgl-check.c:103
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu，但複數表示式的最大值可能等於 %lu"
 
-#: src/msgl-check.c:143
+#: src/msgl-check.c:147
 msgid "plural expression can produce division by zero"
 msgstr "複數表示式會引致被 0 整除的錯誤"
 
-#: src/msgl-check.c:148
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr "複數表示式會引致整數溢位的錯誤"
 
-#: src/msgl-check.c:153
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "複數表示式會引致運算錯誤，例如被 0 整除"
 
-#: src/msgl-check.c:185
+#: src/msgl-check.c:189
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "嘗試使用下列 %s 中屬於合法的型態:\n"
 
-#: src/msgl-check.c:268 src/msgl-check.c:292
+#: src/msgl-check.c:276 src/msgl-check.c:300
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "翻譯檔含有複數型態的翻譯..."
 
-#: src/msgl-check.c:270
+#: src/msgl-check.c:278
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...但檔頭缺少了像 “plural=表示式” 的項目"
 
-#: src/msgl-check.c:294
+#: src/msgl-check.c:302
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...但檔頭缺少了像 “nplurals=整數” 的項目"
 
-#: src/msgl-check.c:330
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr "無效的 nplurals 值"
 
-#: src/msgl-check.c:352
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr "無效的複數表示式"
 
-#: src/msgl-check.c:382 src/msgl-check.c:398
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...但某些訊息只有 %lu 種複數型態"
 
-#: src/msgl-check.c:400
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...但某些訊息有 %lu 種複數型態"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:432
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2334,82 +2361,82 @@ msgstr ""
 "翻譯檔含有複數型態的翻譯，但缺少了以下的標頭欄位：\n"
 "“Plural-Forms: nplurals=<整數>; plural=<表示式>;”"
 
-#: src/msgl-check.c:502
+#: src/msgl-check.c:526
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' 和 `msgid_plural' 欄位並非同時以 '\\n' 開始"
 
-#: src/msgl-check.c:510
+#: src/msgl-check.c:534
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "‘msgid’和‘msgstr[%u]’欄位並非同時以‘\\n’開始"
 
-#: src/msgl-check.c:525
+#: src/msgl-check.c:549
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "‘msgid’和‘msgstr’欄位並非同時以‘\\n’開始"
 
-#: src/msgl-check.c:543
+#: src/msgl-check.c:567
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgid_plural’欄位並非同時以‘\\n’結束"
 
-#: src/msgl-check.c:551
+#: src/msgl-check.c:575
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgstr[%u]’欄位並非同時以‘\\n’結束"
 
-#: src/msgl-check.c:566
+#: src/msgl-check.c:590
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgstr’欄位並非同時以‘\\n’結束"
 
-#: src/msgl-check.c:578
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr "複數處理是 GNU gettext 的擴展功能"
 
-#: src/msgl-check.c:620
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr 缺少了捷徑鍵標記‘%c’"
 
-#: src/msgl-check.c:630
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 含有過多的捷徑鍵標記‘%c’"
 
-#: src/msgl-check.c:670
+#: src/msgl-check.c:695
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "缺少了標頭欄位‘%s’\n"
 
-#: src/msgl-check.c:678
+#: src/msgl-check.c:703
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "標頭欄位‘%s’應該位於行首\n"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:717
 msgid "some header fields still have the initial default value\n"
 msgstr "某些標頭欄位仍然是預設值\n"
 
-#: src/msgl-check.c:705
+#: src/msgl-check.c:730
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "標頭欄位‘%s’仍然是預設值\n"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
 # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
 
-#: src/msgl-iconv.c:262
+#: src/msgl-iconv.c:268
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "輸入檔沒有指定字元集的標頭欄位"
 
-#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:618
+#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2418,7 +2445,7 @@ msgstr ""
 "不支援將字元集由 “%s” 轉換至 “%s”。%s 需要 iconv()，但 iconv() 不支援此種轉換"
 "方式。"
 
-#: src/msgl-iconv.c:314
+#: src/msgl-iconv.c:320
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2426,8 +2453,8 @@ msgid ""
 msgstr ""
 "由 “%s” 轉換至 “%s” 會產生重複訊息：有些本來不同的 msgid 轉換後會變成相同。"
 
-#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:625
+#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2553,17 +2580,17 @@ msgstr "      --translated            只保留已翻譯條目，刪除未翻譯
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       隱藏進度指示\n"
 
-#: src/msgmerge.c:1318
+#: src/msgmerge.c:1340
 #, c-format
 msgid "this message should define plural forms"
 msgstr "此訊息應該有複數型態"
 
-#: src/msgmerge.c:1341
+#: src/msgmerge.c:1363
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "此訊息不應有複數型態"
 
-#: src/msgmerge.c:1679
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2573,26 +2600,26 @@ msgstr ""
 "讀入 %ld 舊翻譯 + %ld 參考條目。合併：%ld，模糊：%ld，未譯：%ld，過時：%"
 "ld。\n"
 
-#: src/msgmerge.c:1687
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " 完成。\n"
 
-#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "使用 %s 不能同時指定檔案名稱"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "用法：%s [選項] [檔案]...\n"
 
-#: src/msgunfmt.c:420
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "將二元碼翻譯檔轉換為 Uniforum 型式的 .po 檔。\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2600,12 +2627,12 @@ msgid ""
 msgstr ""
 "  -j, --java                  Java 模式：產生 Java ResourceBundle class\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# 模式：輸入檔是 .NET .dll 檔\n"
 
-#: src/msgunfmt.c:433
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2614,24 +2641,24 @@ msgstr ""
 "      --csharp-resources      C# resources 模式：輸入內容是 .NET .resources "
 "檔案\n"
 
-#: src/msgunfmt.c:435
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl 模式：輸入資料是 tcl/msgcat .msg 檔\n"
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  檔案 ...                    作為輸入的 .mo 檔\n"
 
-#: src/msgunfmt.c:445
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Java 模式的輸入檔位置：\n"
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2641,41 +2668,41 @@ msgstr ""
 "class 名稱是由語言名稱和 resource 名稱合併來決定的，兩者之間會用底線分隔。\n"
 "class 檔會在 CLASSPATH 變數所指定的目錄中搜尋。\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# 模式的輸入檔位置：\n"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:463
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:468
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl 模式的輸入檔位置：\n"
 
-#: src/msgunfmt.c:474
+#: src/msgunfmt.c:473
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:494
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                將輸出結果進行縮排\n"
 
-#: src/msgunfmt.c:496
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                輸出結果嚴格遵從 Uniforum 格式\n"
 
-#: src/msguniq.c:319
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2695,12 +2722,12 @@ msgstr ""
 "則會由第一個翻譯條目中讀取這些資料。檔案位置是會累積下來的。\n"
 "當使用 --unique 選項時，則會捨棄任何重複的翻譯條目。\n"
 
-#: src/msguniq.c:352
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              只顯示重複條目\n"
 
-#: src/msguniq.c:354
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2708,12 +2735,12 @@ msgid ""
 msgstr ""
 "  -u, --unique                只顯示出現一次的條目，捨棄任何重複的條目\n"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
-#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid ""
 msgstr "<標準輸入>"
 
-#: src/po-charset.c:490
+#: src/po-charset.c:489
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2722,7 +2749,7 @@ msgstr ""
 "字元集“%s”不是通用的編碼名稱。\n"
 "轉換訊息至使用者字元集的功能將不會運作。\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2731,21 +2758,21 @@ msgstr ""
 "不支援字元集 “%s”。%s 需要 iconv()，\n"
 "但 iconv() 不支援 “%s”。\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr "先安裝 GNU libiconv，然後再安裝 GNU gettext，將會修正此問題。\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "仍會繼續執行，但預計解析內容時會出現錯誤。"
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "仍會繼續執行。"
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2754,7 +2781,7 @@ msgstr ""
 "不支援字元集 “%s”。%s 需要 iconv()，\n"
 "但編譯此程式時沒有 iconv() 支援。\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2762,150 +2789,150 @@ msgstr ""
 "檔頭缺少了指定字元集的欄位。\n"
 "轉換訊息至使用者字元集的功能將不會生效。\n"
 
-#: src/po-gram-gen.y:94
+#: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "不一致地使用 #~"
 
-#: src/po-gram-gen.y:241
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "缺少了 ‘msgstr[]’ 段落"
 
-#: src/po-gram-gen.y:250
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "缺少了 ‘msgid_plural’ 段落"
 
-#: src/po-gram-gen.y:258
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "缺少了 ‘msgstr’ 段落"
 
-#: src/po-gram-gen.y:397
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "第一個複數格式的索引數字不是 0"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "複數格式含有錯誤的索引數字"
 
-#: src/po-lex.c:93 src/po-lex.c:112
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "錯誤太多，必須中斷作業"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "無效的位元組序列"
 
-#: src/po-lex.c:468
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "檔案末端出現不完整的位元組序列"
 
-#: src/po-lex.c:478
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "行末出現不完整的位元組序列"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr "iconv 失敗"
 
-#: src/po-lex.c:747
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "不明的關鍵字“%s”"
 
-#: src/po-lex.c:857
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "無效的控制序列"
 
-#: src/po-lex.c:984
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "檔案在字串中段突然結束"
 
-#: src/po-lex.c:990
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "字串中間突然斷行"
 
-#: src/po-lex.c:1011
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator  within string"
 msgstr ""
 
-#: src/read-catalog.c:328 src/xgettext.c:907
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此檔案不能含有 domain 指令"
 
-#: src/read-catalog.c:373
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "訊息被重複定義"
 
-#: src/read-catalog.c:375
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...這是第一次定義的位置"
 
-#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
+#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "檔案 “%s” 被截斷了"
 
-#: src/read-mo.c:125
+#: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "檔案 “%s” 包含並非以 NUL 為結尾的字串"
 
-#: src/read-mo.c:161 src/read-mo.c:270
+#: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "檔案 “%s” 並非 GNU .mo 格式檔案"
 
-#: src/read-mo.c:174
+#: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "檔案 “%s” 在 %s 包含並非以 NUL 為結尾的字串"
 
-#: src/read-properties.c:223
+#: src/read-properties.c:227
 #, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "%s:%lu: 錯誤：Unicode 字元格式 \\uxxxx 無效"
 
-#: src/read-stringtable.c:804
+#: src/read-stringtable.c:802
 #, fuzzy
 msgid "warning: unterminated string"
 msgstr "%s:%d: 警告：字串未完結"
 
-#: src/read-stringtable.c:812
+#: src/read-stringtable.c:810
 #, fuzzy
 msgid "warning: syntax error"
 msgstr "%s:%lu: 警告：格式錯誤"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:895
+#: src/read-stringtable.c:871 src/read-stringtable.c:893
 #, fuzzy
 msgid "warning: unterminated key/value pair"
 msgstr "%s:%d: 警告：正規表示式不完整"
 
-#: src/read-stringtable.c:941
+#: src/read-stringtable.c:939
 #, fuzzy
 msgid "warning: syntax error, expected ';' after string"
 msgstr "%s:%lu: 警告：格式錯誤，字串後應出現‘;’"
 
-#: src/read-stringtable.c:950
+#: src/read-stringtable.c:948
 #, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "%s:%lu: 警告：格式錯誤，字串後應該出現 ‘=’ 或 ‘;’"
 
-#: src/recode-sr-latin.c:117
+#: src/recode-sr-latin.c:116
 #, fuzzy, c-format
 msgid "Written by %s and %s.\n"
 msgstr "由 %s 編寫。\n"
@@ -2914,56 +2941,56 @@ msgstr "由 %s 編寫。\n"
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
 #. "Šegan".
 #. This is a proper name. See the gettext manual, section Names.
-#: src/recode-sr-latin.c:121
+#: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
 msgstr ""
 
-#: src/recode-sr-latin.c:154
+#: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:157
+#: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:332
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
 # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format
-#: src/recode-sr-latin.c:349
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
 
-#: src/urlget.c:147
+#: src/urlget.c:146
 #, c-format
 msgid "expected two arguments"
 msgstr "需要恰好兩個參數"
 
-#: src/urlget.c:164
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "用法：%s [選項] 網址 檔案\n"
 
-#: src/urlget.c:169
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr "擷取並輸出某網址的內容。如果無法存取該網址，則改用指定的本機檔案代替。\n"
 
-#: src/urlget.c:216
+#: src/urlget.c:219
 #, c-format
 msgid "error writing stdout"
 msgstr "寫入至標準輸出時發生錯誤"
 
-#: src/write-catalog.c:102
+#: src/write-catalog.c:126
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2972,7 +2999,7 @@ msgstr ""
 "不可以將多個屬於不同 domain 的翻譯訊息寫入一個 Java .properties 檔案。請改用"
 "PO 檔案格式。"
 
-#: src/write-catalog.c:105
+#: src/write-catalog.c:129
 #, fuzzy
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2980,14 +3007,14 @@ msgid ""
 msgstr ""
 "不可以將多個屬於不同領域的翻譯訊息寫入一個 NeXTstep/GNUstep .strings 檔案。"
 
-#: src/write-catalog.c:138
+#: src/write-catalog.c:162
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr "翻譯檔含有複數型態的翻譯，但輸出檔的格式不支援複數型態。"
 
-#: src/write-catalog.c:173
+#: src/write-catalog.c:197
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -2996,69 +3023,65 @@ msgstr ""
 "翻譯檔中有複數格式的翻譯字句，但輸出格式不支援複數。請嘗試使用 “msgfmt --"
 "java” 產生 Java class，而不用 properties 檔案。"
 
-#: src/write-catalog.c:178
+#: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr "翻譯檔含有複數型態的翻譯，但輸出檔的格式不支援複數型態。"
 
-#: src/write-catalog.c:195
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "無法產生輸出檔 “%s”"
 
-#: src/write-catalog.c:204
-#, no-c-format
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "標準輸出"
 
-#: src/write-csharp.c:618
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .dll format doesn't support contexts\n"
-msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
-
-#: src/write-csharp.c:685
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "無法建立 “%s” 目錄"
 
-#: src/write-csharp.c:747
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "編譯 C# class 檔出現錯誤，請嘗試使用 --verbose 選項"
 
-#: src/write-java.c:920
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the Java ResourceBundle format doesn't support contexts\n"
-msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
+#: src/write-csharp.c:753
+#, fuzzy, c-format
+msgid "compilation of C# class failed"
+msgstr "編譯 C# class 檔出現錯誤，請嘗試使用 --verbose 選項"
 
-#: src/write-java.c:945
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "並非有效的 Java class 名稱：%s"
 
-#: src/write-java.c:1029
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "編譯 Java class 檔出現錯誤，請嘗試使用 --verbose 選項或設定 $JAVAC 環境變數"
 
-#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213
+#: src/write-java.c:1063
+#, fuzzy, c-format
+msgid "compilation of Java class failed, please try to set $JAVAC"
+msgstr ""
+"編譯 Java class 檔出現錯誤，請嘗試使用 --verbose 選項或設定 $JAVAC 環境變數"
+
+#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "當開啟檔案 “%s” 來寫入內容時發生錯誤"
 
-#: src/write-po.c:567
+#: src/write-po.c:766
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "國際化的訊息不應含有 ‘\\%c’ 這個轉義控制序列 (escape sequence)"
 
-#: src/write-po.c:848 src/write-po.c:961
+#: src/write-po.c:1212 src/write-po.c:1341
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3071,7 +3094,7 @@ msgstr ""
 "請考慮使用只有 ASCII 字元的 msgid。\n"
 "%s\n"
 
-#: src/write-po.c:860 src/write-po.c:973
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3084,13 +3107,13 @@ msgstr ""
 "請考慮使用只有 ASCII 字元的 msgid。\n"
 "%s\n"
 
-#: src/write-qt.c:671
+#: src/write-qt.c:667
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 Qt 的翻譯檔不能處理複數型態\n"
 
-#: src/write-qt.c:697
+#: src/write-qt.c:693
 #, fuzzy
 msgid ""
 "message catalog has msgctxt strings containing characters outside ISO-8859-"
@@ -3101,7 +3124,7 @@ msgstr ""
 "翻譯檔中某些 msgid 含有 ISO-8859-1 以外的字元，但 Qt 翻譯檔格式只支援翻譯後的"
 "字句使用 Unicode，未翻譯的字句是不支援的。\n"
 
-#: src/write-qt.c:721
+#: src/write-qt.c:717
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
@@ -3110,58 +3133,58 @@ msgstr ""
 "翻譯檔中某些 msgid 含有 ISO-8859-1 以外的字元，但 Qt 翻譯檔格式只支援翻譯後的"
 "字句使用 Unicode，未翻譯的字句是不支援的。\n"
 
-#: src/write-resources.c:96
+#: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "將內容寫入至 %s 副進程時發生錯誤"
 
-#: src/write-resources.c:132
+#: src/write-resources.c:130
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
 
-#: src/write-resources.c:151
+#: src/write-resources.c:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
 
-#: src/write-tcl.c:158
+#: src/write-tcl.c:157
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 Tcl 的翻譯檔不能處理複數型態\n"
 
-#: src/write-tcl.c:177
+#: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 Tcl 的翻譯檔不能處理複數型態\n"
 
-#: src/x-awk.c:341 src/x-python.c:1059
+#: src/x-awk.c:342 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: 警告：字串未完結"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 警告：正規表示式不完整"
 
-#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: 警告：字元常數未完結"
 
-#: src/x-c.c:1177
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: 警告：字串未完結"
 
-#: src/x-csharp.c:216 src/xgettext.c:1854
+#: src/x-csharp.c:221 src/xgettext.c:1889
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3170,7 +3193,7 @@ msgstr ""
 "%s%s 出現不屬於 ASCII 字元的字串。\n"
 "請使用 --from-code 選項指定源代碼的文字編碼。\n"
 
-#: src/x-csharp.c:263
+#: src/x-csharp.c:268
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3179,7 +3202,7 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:279
+#: src/x-csharp.c:284
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3188,7 +3211,7 @@ msgstr ""
 "%s:%d: 出現無效而且十分長的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:291
+#: src/x-csharp.c:296
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3197,7 +3220,7 @@ msgstr ""
 "%s:%d: 檔案末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:300
+#: src/x-csharp.c:305
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3206,12 +3229,12 @@ msgstr ""
 "%s:%d: 該行末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:309 src/x-python.c:332
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv 失敗"
 
-#: src/x-csharp.c:332
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3220,32 +3243,32 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:1382 src/x-python.c:1259
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: 警告：Unicode 字元無效"
 
-#: src/x-csharp.c:1504 src/x-java.c:825
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: 警告：字元常數未完結"
 
-#: src/x-csharp.c:2008 src/x-java.c:1319
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: 應該有 ‘)’ 的地方出現了 ‘}’"
 
-#: src/x-csharp.c:2042 src/x-java.c:1353
+#: src/x-csharp.c:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: 應該有 ‘}’ 的地方出現了 ‘)’"
 
-#: src/x-glade.c:429 src/x-glade.c:436
+#: src/x-glade.c:611 src/x-glade.c:618
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:463
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3254,42 +3277,47 @@ msgstr ""
 "不支援 “glade” 語言。%s 是需要 expat 軟體的，\n"
 "但這個版本編譯時沒有加入 expat 支援。\n"
 
+#: src/x-java.c:492
+#, fuzzy, c-format
+msgid "%s:%d: warning: lone surrogate U+%04X"
+msgstr "%s:%d: 警告：字串未完結"
+
 #: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: EOF 之前找不到任何表示字串完結的標記 “%s”"
 
-#: src/x-perl.c:1033
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{HEXNUMBER} 缺少了右邊的大括號"
 
-#: src/x-perl.c:1153
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\l”) 無效"
 
-#: src/x-perl.c:1173
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\u”) 無效"
 
-#: src/x-perl.c:1207
+#: src/x-perl.c:1212
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1220
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\L”) 無效"
 
-#: src/x-perl.c:1237
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\U”) 無效"
 
-#: src/x-python.c:234
+#: src/x-python.c:233
 #, fuzzy, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3299,7 +3327,7 @@ msgstr ""
 "%s%s 出現不屬於 ASCII 字元的字串。\n"
 "請使用 --from-code 選項指定源代碼的文字編碼。\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:281
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3309,7 +3337,7 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:298
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3319,7 +3347,7 @@ msgstr ""
 "%s:%d: 出現無效而且十分長的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:311
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3329,7 +3357,7 @@ msgstr ""
 "%s:%d: 檔案末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:321
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3339,7 +3367,7 @@ msgstr ""
 "%s:%d: 該行末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3349,27 +3377,27 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:675
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:107
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: 無效的字串定義"
 
-#: src/x-rst.c:171
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # 後缺少了數字"
 
-#: src/x-rst.c:206
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: 無效的字串表示式"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3377,27 +3405,27 @@ msgid ""
 msgstr ""
 "%s:%lu: 警告：$\"...\" 這種格式因為安全理由已經過時；請改用 eval_gettext"
 
-#: src/xgettext.c:547
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "當結果被導向至標準輸出時，不可以用 --join-existing 選項"
 
-#: src/xgettext.c:552
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "若無關鍵字，xgettext 將無法運作"
 
-#: src/xgettext.c:695
+#: src/xgettext.c:715
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "警告：無法辨認檔案 ‘%s’ 的副檔名 ‘%s’；會假設是 C 格式來處理"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "由指定的輸入檔抽取可翻譯的字串。\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3405,23 +3433,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME   使用 NAME.po 作為輸出檔 (而不是 messages.po)\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           將輸出內容寫入至指定檔案\n"
 
-#: src/xgettext.c:773
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DIR        輸出檔會存取在指定目錄\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:798
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "輸入檔的語言選擇：\n"
 
-#: src/xgettext.c:780
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3440,19 +3468,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的簡寫\n"
 
-#: src/xgettext.c:788
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "預設的語言是由輸入檔的延伸檔名決定的。\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3461,39 +3489,39 @@ msgstr ""
 "      --from-code=NAME        輸入檔的文字編碼\n"
 "                                (Python, Tcl, Glade 例外)\n"
 
-#: src/xgettext.c:796
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "輸入檔內容預設會當作 ASCII 看待。\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         合併已存在的訊息檔\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  不取出屬於 FILE.po 的訊息\n"
 
-#: src/xgettext.c:805
+#: src/xgettext.c:825
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:809
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr "個別語言特殊選項：\n"
 
-#: src/xgettext.c:811
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           抽取所有字串\n"
 
-#: src/xgettext.c:813 src/xgettext.c:820
+#: src/xgettext.c:833 src/xgettext.c:840
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3506,7 +3534,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:837
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3515,7 +3543,7 @@ msgstr ""
 "  -k, --keyword[=WORD]        要留意的額外關鍵字 (如果沒有指定，\n"
 "                              表示不使用預設的關鍵字)\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3523,7 +3551,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3536,48 +3564,53 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             支援讀取輸入內容中的 ANSI C trigraph\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (只適用於 C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:837 src/xgettext.c:841
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (只適用於 C++)\n"
 
-#: src/xgettext.c:839
+#: src/xgettext.c:859
+#, fuzzy, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr "      --qt                    辨認 Qt 格式的字串\n"
+
+#: src/xgettext.c:863
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:843
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 顯示較詳細的格式字串辨認結果\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     輸出檔格式為 Java .properties 檔\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3585,58 +3618,68 @@ msgstr ""
 "      --foreign-user          輸出檔不加上 FSF 的版權宣告，適用於 FSF 以外的"
 "專案\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:905
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#: src/xgettext.c:907
+#, fuzzy, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
+
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  指定匯報 msgid 問題時的郵件地址\n"
 
-#: src/xgettext.c:883
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:885
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 msgstr ""
 
-#: src/xgettext.c:1649
+#: src/xgettext.c:1686
 #, c-format
 msgid ""
 "A --flag argument doesn't have the ::[pass-] syntax: %"
 "s"
 msgstr ""
 
-#: src/xgettext.c:1750
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "標準輸入"
 
-#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: 警告："
 
-#: src/xgettext.c:1933
+#: src/xgettext.c:1968
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1934
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 msgstr "縱使表面上 %s 宣告了是 %s 格式字串，但實際上不是。原因為：%s\n"
 
-#: src/xgettext.c:1965
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3645,7 +3688,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2023
+#: src/xgettext.c:2058
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3655,27 +3698,27 @@ msgstr ""
 "gettext(\"\") 會回傳檔案開始部份的資訊，\n"
 "並非空白字串。\n"
 
-#: src/xgettext.c:2626
+#: src/xgettext.c:2664
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "%2$s 的參數 %1$s 不明確"
 
-#: src/xgettext.c:2653
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2678
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2699
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2779
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3687,15 +3730,38 @@ msgstr ""
 "MSGID_BUGS_ADDRESS 變數；否則請在指令中\n"
 "使用 --msgid-bugs-address 選項。\n"
 
-#: src/xgettext.c:2978
+#: src/xgettext.c:3035
 #, c-format
 msgid "language `%s' unknown"
 msgstr "不明的語言 ‘%s’"
 
-#: libgettextpo/gettext-po.c:85
+#: libgettextpo/gettext-po.c:84
 msgid ""
 msgstr "<未命名>"
 
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
+#~ msgstr ""
+#~ "版權所有 (C) %s Free Software Foundation, Inc.\n"
+#~ "這是自由軟體；請參考原始碼的版權聲明。本軟體不提供任何保證，甚至不會包括\n"
+#~ "可售性或適用於任何特定目的的保證。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the C# .dll format doesn't support contexts\n"
+#~ msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "message catalog has context dependent translations\n"
+#~ "but the Java ResourceBundle format doesn't support contexts\n"
+#~ msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
+
 #~ msgid "The %%J directive is only allowed at the beginning of the string."
 #~ msgstr "%%J 只允許在字串最開始出現。"
 
diff --git a/gettext-tools/src/po-gram-gen.c b/gettext-tools/src/po-gram-gen.c
index fa798f9a7..e4a3391b7 100644
--- a/gettext-tools/src/po-gram-gen.c
+++ b/gettext-tools/src/po-gram-gen.c
@@ -1,24 +1,68 @@
-/* A Bison parser, made from po-gram-gen.y
-   by GNU bison 1.35.  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-# define	COMMENT	257
-# define	DOMAIN	258
-# define	JUNK	259
-# define	PREV_MSGCTXT	260
-# define	PREV_MSGID	261
-# define	PREV_MSGID_PLURAL	262
-# define	PREV_STRING	263
-# define	MSGCTXT	264
-# define	MSGID	265
-# define	MSGID_PLURAL	266
-# define	MSGSTR	267
-# define	NAME	268
-# define	NUMBER	269
-# define	STRING	270
-
-#line 20 "po-gram-gen.y"
+/* A Bison parser, made by GNU Bison 2.3a.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3a"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+
+
+/* Copy the first part of user declarations.  */
+/* Line 164 of yacc.c.  */
+#line 19 "po-gram-gen.y"
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -125,10 +169,72 @@ do_callback_message (char *msgctxt,
     free ((value).ctxt);
 
 
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     COMMENT = 258,
+     DOMAIN = 259,
+     JUNK = 260,
+     PREV_MSGCTXT = 261,
+     PREV_MSGID = 262,
+     PREV_MSGID_PLURAL = 263,
+     PREV_STRING = 264,
+     MSGCTXT = 265,
+     MSGID = 266,
+     MSGID_PLURAL = 267,
+     MSGSTR = 268,
+     NAME = 269,
+     NUMBER = 270,
+     STRING = 271
+   };
+#endif
+/* Tokens.  */
+#define COMMENT 258
+#define DOMAIN 259
+#define JUNK 260
+#define PREV_MSGCTXT 261
+#define PREV_MSGID 262
+#define PREV_MSGID_PLURAL 263
+#define PREV_STRING 264
+#define MSGCTXT 265
+#define MSGID 266
+#define MSGID_PLURAL 267
+#define MSGSTR 268
+#define NAME 269
+#define NUMBER 270
+#define STRING 271
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{/* Line 191 of yacc.c.  */
 #line 143 "po-gram-gen.y"
-#ifndef YYSTYPE
-typedef union
-{
+
   struct { char *string; lex_pos_ty pos; bool obsolete; } string;
   struct { string_list_ty stringlist; lex_pos_ty pos; bool obsolete; } stringlist;
   struct { long number; lex_pos_ty pos; bool obsolete; } number;
@@ -136,289 +242,212 @@ typedef union
   struct { char *ctxt; char *id; char *id_plural; lex_pos_ty pos; bool obsolete; } prev;
   struct { char *prev_ctxt; char *prev_id; char *prev_id_plural; char *ctxt; lex_pos_ty pos; bool obsolete; } message_intro;
   struct { struct msgstr_def rhs; lex_pos_ty pos; bool obsolete; } rhs;
-} yystype;
-# define YYSTYPE yystype
+}
+/* Line 191 of yacc.c.  */
+#line 248 "po-gram-gen.c"
+	YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
-#endif
-#ifndef YYDEBUG
-# define YYDEBUG 0
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
 
 
-#define	YYFINAL		46
-#define	YYFLAG		-32768
-#define	YYNTBASE	19
 
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 270 ? yytranslate[x] : 33)
+/* Copy the second part of user declarations.  */
 
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
-static const char yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    15,     2,    16,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    17,
-      18
-};
-
-#if YYDEBUG
-static const short yyprhs[] =
-{
-       0,     0,     1,     4,     7,    10,    13,    15,    18,    23,
-      28,    32,    36,    39,    41,    44,    47,    51,    53,    57,
-      59,    63,    66,    69,    71,    74,    80,    82,    85,    87
-};
-static const short yyrhs[] =
-{
-      -1,    19,    20,     0,    19,    21,     0,    19,    22,     0,
-      19,     1,     0,     3,     0,     4,    18,     0,    23,    31,
-      13,    31,     0,    23,    31,    27,    29,     0,    23,    31,
-      27,     0,    23,    31,    29,     0,    23,    31,     0,    25,
-       0,    24,    25,     0,    26,    32,     0,    26,    32,    28,
-       0,    11,     0,    10,    31,    11,     0,     7,     0,     6,
-      32,     7,     0,    12,    31,     0,     8,    32,     0,    30,
-       0,    29,    30,     0,    13,    15,    17,    16,    31,     0,
-      18,     0,    31,    18,     0,     9,     0,    32,     9,     0
-};
+/* Line 221 of yacc.c.  */
+#line 261 "po-gram-gen.c"
 
+#ifdef short
+# undef short
 #endif
 
-#if YYDEBUG
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const short yyrline[] =
-{
-       0,   170,   171,   172,   173,   174,   179,   187,   195,   216,
-     237,   246,   255,   266,   275,   289,   298,   312,   318,   329,
-     335,   347,   358,   369,   373,   388,   411,   418,   429,   436
-};
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
 #endif
 
-
-#if (YYDEBUG) || defined YYERROR_VERBOSE
-
-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
-static const char *const yytname[] =
-{
-  "$", "error", "$undefined.", "COMMENT", "DOMAIN", "JUNK", "PREV_MSGCTXT", 
-  "PREV_MSGID", "PREV_MSGID_PLURAL", "PREV_STRING", "MSGCTXT", "MSGID", 
-  "MSGID_PLURAL", "MSGSTR", "NAME", "'['", "']'", "NUMBER", "STRING", 
-  "po_file", "comment", "domain", "message", "message_intro", "prev", 
-  "msg_intro", "prev_msg_intro", "msgid_pluralform", 
-  "prev_msgid_pluralform", "pluralform_list", "pluralform", "string_list", 
-  "prev_string_list", 0
-};
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
 #endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const short yyr1[] =
-{
-       0,    19,    19,    19,    19,    19,    20,    21,    22,    22,
-      22,    22,    22,    23,    23,    24,    24,    25,    25,    26,
-      26,    27,    28,    29,    29,    30,    31,    31,    32,    32
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const short yyr2[] =
-{
-       0,     0,     2,     2,     2,     2,     1,     2,     4,     4,
-       3,     3,     2,     1,     2,     2,     3,     1,     3,     1,
-       3,     2,     2,     1,     2,     5,     1,     2,     1,     2
-};
-
-/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
-   doesn't specify something else to do.  Zero means the default is an
-   error. */
-static const short yydefact[] =
-{
-       1,     0,     5,     6,     0,     0,    19,     0,    17,     2,
-       3,     4,     0,     0,    13,     0,     7,    28,     0,    26,
-       0,    12,    14,    15,    20,    29,    18,    27,     0,     0,
-      10,    11,    23,     0,    16,    21,     0,     8,     0,     9,
-      24,    22,     0,     0,    25,     0,     0
-};
-
-static const short yydefgoto[] =
-{
-       1,     9,    10,    11,    12,    13,    14,    15,    30,    34,
-      31,    32,    20,    18
-};
-
-static const short yypact[] =
-{
-  -32768,     2,-32768,-32768,    -8,     5,-32768,     0,-32768,-32768,
-  -32768,-32768,     0,    13,-32768,     5,-32768,-32768,    20,-32768,
-      -7,     8,-32768,    24,-32768,-32768,-32768,-32768,     0,     7,
-      15,    15,-32768,     5,-32768,    12,    17,    12,    21,    15,
-  -32768,    26,    22,     0,    12,    37,-32768
-};
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
 
-static const short yypgoto[] =
-{
-  -32768,-32768,-32768,-32768,-32768,-32768,    27,-32768,-32768,-32768,
-       9,   -24,   -12,   -14
-};
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
 
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include  /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
 
-#define	YYLAST		40
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include  /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
 
-static const short yytable[] =
-{
-      21,    23,    45,     2,    26,     3,     4,    40,     5,     6,
-      16,    27,     7,     8,    17,    40,    35,    37,    19,    41,
-      28,    29,    36,     7,     8,    19,    27,    24,    38,    25,
-      27,    44,    33,    25,    42,    25,    36,    46,    43,    39,
-      22
-};
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
 
-static const short yycheck[] =
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
+#endif
 {
-      12,    15,     0,     1,    11,     3,     4,    31,     6,     7,
-      18,    18,    10,    11,     9,    39,    28,    29,    18,    33,
-      12,    13,    15,    10,    11,    18,    18,     7,    13,     9,
-      18,    43,     8,     9,    17,     9,    15,     0,    16,    30,
-      13
-};
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "bison.simple"
-
-/* Skeleton output parser for bison,
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, along with this program.  If not, see .  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser when
-   the %semantic_parser declaration is not specified in the grammar.
-   It was written by Richard Stallman by simplifying the hairy parser
-   used when %semantic_parser is specified.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
+  return yyi;
+}
+#endif
 
-#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
+#if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include  /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include  /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
 #   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include  /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
 #    endif
 #   endif
 #  endif
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
 # else
-#  if defined (__STDC__) || defined (__cplusplus)
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
 #   include  /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
 #  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
 # endif
-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short yyss;
+  yytype_int16 yyss;
   YYSTYPE yyvs;
-# if YYLSP_NEEDED
-  YYLTYPE yyls;
-# endif
-};
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
-# if YYLSP_NEEDED
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
-      + 2 * YYSTACK_GAP_MAX)
-# else
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
-      + YYSTACK_GAP_MAX)
-# endif
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if 1 < __GNUC__
+#  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;				\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -433,97 +462,307 @@ union yyalloc
 	YYSIZE_T yynewbytes;						\
 	YYCOPY (&yyptr->Stack, Stack, yysize);				\
 	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
+    while (YYID (0))
 
 #endif
 
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  2
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   40
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  19
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  15
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  30
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  46
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   271
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    15,     2,    16,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      17,    18
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint8 yyprhs[] =
+{
+       0,     0,     3,     4,     7,    10,    13,    16,    18,    21,
+      26,    31,    35,    39,    42,    44,    47,    50,    54,    56,
+      60,    62,    66,    69,    72,    74,    77,    83,    85,    88,
+      90
+};
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      20,     0,    -1,    -1,    20,    21,    -1,    20,    22,    -1,
+      20,    23,    -1,    20,     1,    -1,     3,    -1,     4,    18,
+      -1,    24,    32,    13,    32,    -1,    24,    32,    28,    30,
+      -1,    24,    32,    28,    -1,    24,    32,    30,    -1,    24,
+      32,    -1,    26,    -1,    25,    26,    -1,    27,    33,    -1,
+      27,    33,    29,    -1,    11,    -1,    10,    32,    11,    -1,
+       7,    -1,     6,    33,     7,    -1,    12,    32,    -1,     8,
+      33,    -1,    31,    -1,    30,    31,    -1,    13,    15,    17,
+      16,    32,    -1,    18,    -1,    32,    18,    -1,     9,    -1,
+      33,     9,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   168,   168,   170,   171,   172,   173,   178,   186,   194,
+     215,   236,   245,   254,   265,   274,   288,   297,   311,   317,
+     328,   334,   346,   357,   368,   372,   387,   410,   417,   428,
+     435
+};
 #endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "COMMENT", "DOMAIN", "JUNK",
+  "PREV_MSGCTXT", "PREV_MSGID", "PREV_MSGID_PLURAL", "PREV_STRING",
+  "MSGCTXT", "MSGID", "MSGID_PLURAL", "MSGSTR", "NAME", "'['", "']'",
+  "NUMBER", "STRING", "$accept", "po_file", "comment", "domain", "message",
+  "message_intro", "prev", "msg_intro", "prev_msg_intro",
+  "msgid_pluralform", "prev_msgid_pluralform", "pluralform_list",
+  "pluralform", "string_list", "prev_string_list", 0
+};
 #endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include  /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,    91,    93,   270,   271
+};
 # endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    19,    20,    20,    20,    20,    20,    21,    22,    23,
+      23,    23,    23,    23,    24,    24,    25,    25,    26,    26,
+      27,    27,    28,    29,    30,    30,    31,    32,    32,    33,
+      33
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     2,     2,     2,     2,     1,     2,     4,
+       4,     3,     3,     2,     1,     2,     2,     3,     1,     3,
+       1,     3,     2,     2,     1,     2,     5,     1,     2,     1,
+       2
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       2,     0,     1,     6,     7,     0,     0,    20,     0,    18,
+       3,     4,     5,     0,     0,    14,     0,     8,    29,     0,
+      27,     0,    13,    15,    16,    21,    30,    19,    28,     0,
+       0,    11,    12,    24,     0,    17,    22,     0,     9,     0,
+      10,    25,    23,     0,     0,    26
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     1,    10,    11,    12,    13,    14,    15,    16,    31,
+      35,    32,    33,    21,    19
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -26
+static const yytype_int8 yypact[] =
+{
+     -26,     2,   -26,   -26,   -26,    -8,     5,   -26,     0,   -26,
+     -26,   -26,   -26,     0,    13,   -26,     5,   -26,   -26,    20,
+     -26,    -7,     8,   -26,    24,   -26,   -26,   -26,   -26,     0,
+       7,    15,    15,   -26,     5,   -26,    12,    17,    12,    21,
+      15,   -26,    26,    22,     0,    12
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -26,   -26,   -26,   -26,   -26,   -26,   -26,    23,   -26,   -26,
+     -26,     9,   -25,   -13,   -15
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -1
+static const yytype_uint8 yytable[] =
+{
+      22,    24,     2,     3,    27,     4,     5,    41,     6,     7,
+      17,    28,     8,     9,    18,    41,    36,    38,    20,    42,
+      29,    30,    37,     8,     9,    20,    28,    25,    39,    26,
+      28,    45,    34,    26,    43,    26,    37,    23,    44,     0,
+      40
+};
+
+static const yytype_int8 yycheck[] =
+{
+      13,    16,     0,     1,    11,     3,     4,    32,     6,     7,
+      18,    18,    10,    11,     9,    40,    29,    30,    18,    34,
+      12,    13,    15,    10,    11,    18,    18,     7,    13,     9,
+      18,    44,     8,     9,    17,     9,    15,    14,    16,    -1,
+      31
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,    20,     0,     1,     3,     4,     6,     7,    10,    11,
+      21,    22,    23,    24,    25,    26,    27,    18,     9,    33,
+      18,    32,    32,    26,    33,     7,     9,    11,    18,    12,
+      13,    28,    30,    31,     8,    29,    32,    15,    32,    13,
+      30,    31,    33,    17,    16,    32
+};
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
+#define YYEMPTY		(-2)
 #define YYEOF		0
+
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
+
 #define YYFAIL		goto yyerrlab
+
 #define YYRECOVERING()  (!!yyerrstatus)
+
 #define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");			\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
+
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).
-
-   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
-   first token.  By default, to implement support for ranges, extend
-   its range to the last symbol.  */
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
 
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
-   Current.last_line   = Rhs[N].last_line;	\
-   Current.last_column = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
 #endif
 
 
-/* YYLEX -- calling `yylex' with the right arguments.  */
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
 
-#if YYPURE
-# if YYLSP_NEEDED
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval, &yylloc)
-#  endif
-# else /* !YYLSP_NEEDED */
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval)
-#  endif
-# endif /* !YYLSP_NEEDED */
-#else /* !YYPURE */
-# define YYLEX			yylex ()
-#endif /* !YYPURE */
 
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -537,14 +776,158 @@ while (0)
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (0)
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
 
+
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
 # define YYINITDEPTH 200
@@ -554,147 +937,327 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
+
 
-#ifdef YYERROR_VERBOSE
+
+#if YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
+#  if defined __GLIBC__ && defined _STRING_H
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#   else
+#else
+static YYSIZE_T
 yystrlen (yystr)
-     const char *yystr;
-#   endif
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
 {
-  register const char *yys = yystr;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
-  while (*yys++ != '\0')
+  while ((*yyd++ = *yys++) != '\0')
     continue;
 
-  return yys - yystr - 1;
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
 }
-#  endif
-# endif
+#endif /* YYERROR_VERBOSE */
+
 
-# ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-#   if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  YYUSE (yyvaluep);
 
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  return yyd - 1;
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
 }
-#  endif
-# endif
-#endif
 
-#line 315 "bison.simple"
-
 
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
+/* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL
-# else
-#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-# endif
-#else /* !YYPARSE_PARAM */
-# define YYPARSE_PARAM_ARG
-# define YYPARSE_PARAM_DECL
-#endif /* !YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-# ifdef YYPARSE_PARAM
-int yyparse (void *);
-# else
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void);
-# endif
+#else
+int yyparse ();
 #endif
+#endif /* ! YYPARSE_PARAM */
 
-/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
-   variables are global, or local to YYPARSE.  */
-
-#define YY_DECL_NON_LSP_VARIABLES			\
-/* The lookahead symbol.  */				\
-int yychar;						\
-							\
-/* The semantic value of the lookahead symbol. */	\
-YYSTYPE yylval;						\
-							\
-/* Number of parse errors so far.  */			\
-int yynerrs;
 
-#if YYLSP_NEEDED
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES			\
-						\
-/* Location data for the lookahead symbol.  */	\
-YYLTYPE yylloc;
-#else
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES
-#endif
 
+/* The lookahead symbol.  */
+int yychar;
 
-/* If nonreentrant, generate the variables here. */
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
 
-#if !YYPURE
-YY_DECL_VARIABLES
-#endif  /* !YYPURE */
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
 
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int
-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  /* If reentrant, generate the variables here. */
-#if YYPURE
-  YY_DECL_VARIABLES
-#endif  /* !YYPURE */
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
 
-  register int yystate;
-  register int yyn;
+#endif
+#endif
+{
+  
+  int yystate;
+  int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   /* Lookahead token as an internal (translated) token number.  */
-  int yychar1 = 0;
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -704,42 +1267,30 @@ yyparse (YYPARSE_PARAM_ARG)
      Refer to the stacks thru separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */
 
-  /* The state stack. */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;
 
-#if YYLSP_NEEDED
-  /* The location stack.  */
-  YYLTYPE yylsa[YYINITDEPTH];
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-#endif
 
-#if YYLSP_NEEDED
-# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-# define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
-#if YYLSP_NEEDED
-  YYLTYPE yyloc;
-#endif
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule. */
-  int yylen;
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
@@ -755,9 +1306,7 @@ yyparse (YYPARSE_PARAM_ARG)
 
   yyssp = yyss;
   yyvsp = yyvs;
-#if YYLSP_NEEDED
-  yylsp = yyls;
-#endif
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -765,70 +1314,60 @@ yyparse (YYPARSE_PARAM_ARG)
 `------------------------------------------------------------*/
  yynewstate:
   /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
+     have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
  yysetstate:
   *yyssp = yystate;
 
-  if (yyssp >= yyss + yystacksize - 1)
+  if (yyss + yystacksize - 1 <= yyssp)
     {
       /* Get the current used size of the three stacks, in elements.  */
       YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack. Use copies of
+	/* Give user a chance to reallocate the stack.  Use copies of
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
+
 
 	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  */
-# if YYLSP_NEEDED
-	YYLTYPE *yyls1 = yyls;
-	/* This used to be a conditional around just the two extra args,
-	   but that might be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yyls1, yysize * sizeof (*yylsp),
-		    &yystacksize);
-	yyls = yyls1;
-# else
-	yyoverflow ("parser stack overflow",
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
-# endif
+
 	yyss = yyss1;
 	yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	goto yyoverflowlab;
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
       yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
+      if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
-# if YYLSP_NEEDED
-	YYSTACK_RELOCATE (yyls);
-# endif
-# undef YYSTACK_RELOCATE
+
+#  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
       }
@@ -837,123 +1376,83 @@ yyparse (YYPARSE_PARAM_ARG)
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
-#if YYLSP_NEEDED
-      yylsp = yyls + yysize - 1;
-#endif
+
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
-      if (yyssp >= yyss + yystacksize - 1)
+      if (yyss + yystacksize - 1 <= yyssp)
 	YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  goto yybackup;
+  if (yystate == YYFINAL)
+    YYACCEPT;
 
+  goto yybackup;
 
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
 
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
 
   /* First try to decide what to do without reference to lookahead token.  */
-
   yyn = yypact[yystate];
-  if (yyn == YYFLAG)
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
 
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
+  if (yychar <= YYEOF)
     {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
+      yychar = yytoken = YYEOF;
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yychar1 = YYTRANSLATE (yychar);
-
-#if YYDEBUG
-     /* We have to keep this `#if YYDEBUG', since we use variables
-	which are defined only if `YYDEBUG' is set.  */
-      if (yydebug)
-	{
-	  YYFPRINTF (stderr, "Next token is %d (%s",
-		     yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise
-	     meaning of a token, for further debugging info.  */
-# ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-# endif
-	  YYFPRINTF (stderr, ")\n");
-	}
-#endif
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
     goto yydefault;
-
   yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
+  if (yyn <= 0)
     {
-      if (yyn == YYFLAG)
+      if (yyn == 0 || yyn == YYTABLE_NINF)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
-	      yychar, yytname[yychar1]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
   yystate = yyn;
+  *++yyvsp = yylval;
+
   goto yynewstate;
 
 
@@ -977,334 +1476,347 @@ yyreduce:
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 
-     Otherwise, the following line sets YYVAL to the semantic value of
-     the lookahead token.  This behavior is undocumented and Bison
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
      users should not rely upon it.  Assigning to YYVAL
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 
-#if YYLSP_NEEDED
-  /* Similarly for the default location.  Let the user run additional
-     commands if for instance locations are ranges.  */
-  yyloc = yylsp[1-yylen];
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-#endif
 
-#if YYDEBUG
-  /* We have to keep this `#if YYDEBUG', since we use variables which
-     are defined only if `YYDEBUG' is set.  */
-  if (yydebug)
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
     {
-      int yyi;
-
-      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-		 yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
-	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-  switch (yyn) {
-
-case 6:
-#line 180 "po-gram-gen.y"
-{
-		  po_callback_comment_dispatcher (yyvsp[0].string.string);
+        case 7:
+/* Line 1269 of yacc.c.  */
+#line 179 "po-gram-gen.y"
+    {
+		  po_callback_comment_dispatcher ((yyvsp[(1) - (1)].string).string);
 		}
     break;
-case 7:
-#line 188 "po-gram-gen.y"
-{
-		   po_callback_domain (yyvsp[0].string.string);
+
+  case 8:
+/* Line 1269 of yacc.c.  */
+#line 187 "po-gram-gen.y"
+    {
+		   po_callback_domain ((yyvsp[(2) - (2)].string).string);
 		}
     break;
-case 8:
-#line 196 "po-gram-gen.y"
-{
-		  char *string2 = string_list_concat_destroy (&yyvsp[-2].stringlist.stringlist);
-		  char *string4 = string_list_concat_destroy (&yyvsp[0].stringlist.stringlist);
-
-		  check_obsolete (yyvsp[-3].message_intro, yyvsp[-2].stringlist);
-		  check_obsolete (yyvsp[-3].message_intro, yyvsp[-1].pos);
-		  check_obsolete (yyvsp[-3].message_intro, yyvsp[0].stringlist);
-		  if (!yyvsp[-3].message_intro.obsolete || pass_obsolete_entries)
-		    do_callback_message (yyvsp[-3].message_intro.ctxt, string2, &yyvsp[-3].message_intro.pos, NULL,
-					 string4, strlen (string4) + 1, &yyvsp[-1].pos.pos,
-					 yyvsp[-3].message_intro.prev_ctxt,
-					 yyvsp[-3].message_intro.prev_id, yyvsp[-3].message_intro.prev_id_plural,
-					 yyvsp[-3].message_intro.obsolete);
+
+  case 9:
+/* Line 1269 of yacc.c.  */
+#line 195 "po-gram-gen.y"
+    {
+		  char *string2 = string_list_concat_destroy (&(yyvsp[(2) - (4)].stringlist).stringlist);
+		  char *string4 = string_list_concat_destroy (&(yyvsp[(4) - (4)].stringlist).stringlist);
+
+		  check_obsolete ((yyvsp[(1) - (4)].message_intro), (yyvsp[(2) - (4)].stringlist));
+		  check_obsolete ((yyvsp[(1) - (4)].message_intro), (yyvsp[(3) - (4)].pos));
+		  check_obsolete ((yyvsp[(1) - (4)].message_intro), (yyvsp[(4) - (4)].stringlist));
+		  if (!(yyvsp[(1) - (4)].message_intro).obsolete || pass_obsolete_entries)
+		    do_callback_message ((yyvsp[(1) - (4)].message_intro).ctxt, string2, &(yyvsp[(1) - (4)].message_intro).pos, NULL,
+					 string4, strlen (string4) + 1, &(yyvsp[(3) - (4)].pos).pos,
+					 (yyvsp[(1) - (4)].message_intro).prev_ctxt,
+					 (yyvsp[(1) - (4)].message_intro).prev_id, (yyvsp[(1) - (4)].message_intro).prev_id_plural,
+					 (yyvsp[(1) - (4)].message_intro).obsolete);
 		  else
 		    {
-		      free_message_intro (yyvsp[-3].message_intro);
+		      free_message_intro ((yyvsp[(1) - (4)].message_intro));
 		      free (string2);
 		      free (string4);
 		    }
 		}
     break;
-case 9:
-#line 217 "po-gram-gen.y"
-{
-		  char *string2 = string_list_concat_destroy (&yyvsp[-2].stringlist.stringlist);
-
-		  check_obsolete (yyvsp[-3].message_intro, yyvsp[-2].stringlist);
-		  check_obsolete (yyvsp[-3].message_intro, yyvsp[-1].string);
-		  check_obsolete (yyvsp[-3].message_intro, yyvsp[0].rhs);
-		  if (!yyvsp[-3].message_intro.obsolete || pass_obsolete_entries)
-		    do_callback_message (yyvsp[-3].message_intro.ctxt, string2, &yyvsp[-3].message_intro.pos, yyvsp[-1].string.string,
-					 yyvsp[0].rhs.rhs.msgstr, yyvsp[0].rhs.rhs.msgstr_len, &yyvsp[0].rhs.pos,
-					 yyvsp[-3].message_intro.prev_ctxt,
-					 yyvsp[-3].message_intro.prev_id, yyvsp[-3].message_intro.prev_id_plural,
-					 yyvsp[-3].message_intro.obsolete);
+
+  case 10:
+/* Line 1269 of yacc.c.  */
+#line 216 "po-gram-gen.y"
+    {
+		  char *string2 = string_list_concat_destroy (&(yyvsp[(2) - (4)].stringlist).stringlist);
+
+		  check_obsolete ((yyvsp[(1) - (4)].message_intro), (yyvsp[(2) - (4)].stringlist));
+		  check_obsolete ((yyvsp[(1) - (4)].message_intro), (yyvsp[(3) - (4)].string));
+		  check_obsolete ((yyvsp[(1) - (4)].message_intro), (yyvsp[(4) - (4)].rhs));
+		  if (!(yyvsp[(1) - (4)].message_intro).obsolete || pass_obsolete_entries)
+		    do_callback_message ((yyvsp[(1) - (4)].message_intro).ctxt, string2, &(yyvsp[(1) - (4)].message_intro).pos, (yyvsp[(3) - (4)].string).string,
+					 (yyvsp[(4) - (4)].rhs).rhs.msgstr, (yyvsp[(4) - (4)].rhs).rhs.msgstr_len, &(yyvsp[(4) - (4)].rhs).pos,
+					 (yyvsp[(1) - (4)].message_intro).prev_ctxt,
+					 (yyvsp[(1) - (4)].message_intro).prev_id, (yyvsp[(1) - (4)].message_intro).prev_id_plural,
+					 (yyvsp[(1) - (4)].message_intro).obsolete);
 		  else
 		    {
-		      free_message_intro (yyvsp[-3].message_intro);
+		      free_message_intro ((yyvsp[(1) - (4)].message_intro));
 		      free (string2);
-		      free (yyvsp[-1].string.string);
-		      free (yyvsp[0].rhs.rhs.msgstr);
+		      free ((yyvsp[(3) - (4)].string).string);
+		      free ((yyvsp[(4) - (4)].rhs).rhs.msgstr);
 		    }
 		}
     break;
-case 10:
-#line 238 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-2].message_intro, yyvsp[-1].stringlist);
-		  check_obsolete (yyvsp[-2].message_intro, yyvsp[0].string);
-		  po_gram_error_at_line (&yyvsp[-2].message_intro.pos, _("missing `msgstr[]' section"));
-		  free_message_intro (yyvsp[-2].message_intro);
-		  string_list_destroy (&yyvsp[-1].stringlist.stringlist);
-		  free (yyvsp[0].string.string);
+
+  case 11:
+/* Line 1269 of yacc.c.  */
+#line 237 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (3)].message_intro), (yyvsp[(2) - (3)].stringlist));
+		  check_obsolete ((yyvsp[(1) - (3)].message_intro), (yyvsp[(3) - (3)].string));
+		  po_gram_error_at_line (&(yyvsp[(1) - (3)].message_intro).pos, _("missing `msgstr[]' section"));
+		  free_message_intro ((yyvsp[(1) - (3)].message_intro));
+		  string_list_destroy (&(yyvsp[(2) - (3)].stringlist).stringlist);
+		  free ((yyvsp[(3) - (3)].string).string);
 		}
     break;
-case 11:
-#line 247 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-2].message_intro, yyvsp[-1].stringlist);
-		  check_obsolete (yyvsp[-2].message_intro, yyvsp[0].rhs);
-		  po_gram_error_at_line (&yyvsp[-2].message_intro.pos, _("missing `msgid_plural' section"));
-		  free_message_intro (yyvsp[-2].message_intro);
-		  string_list_destroy (&yyvsp[-1].stringlist.stringlist);
-		  free (yyvsp[0].rhs.rhs.msgstr);
+
+  case 12:
+/* Line 1269 of yacc.c.  */
+#line 246 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (3)].message_intro), (yyvsp[(2) - (3)].stringlist));
+		  check_obsolete ((yyvsp[(1) - (3)].message_intro), (yyvsp[(3) - (3)].rhs));
+		  po_gram_error_at_line (&(yyvsp[(1) - (3)].message_intro).pos, _("missing `msgid_plural' section"));
+		  free_message_intro ((yyvsp[(1) - (3)].message_intro));
+		  string_list_destroy (&(yyvsp[(2) - (3)].stringlist).stringlist);
+		  free ((yyvsp[(3) - (3)].rhs).rhs.msgstr);
 		}
     break;
-case 12:
-#line 256 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-1].message_intro, yyvsp[0].stringlist);
-		  po_gram_error_at_line (&yyvsp[-1].message_intro.pos, _("missing `msgstr' section"));
-		  free_message_intro (yyvsp[-1].message_intro);
-		  string_list_destroy (&yyvsp[0].stringlist.stringlist);
+
+  case 13:
+/* Line 1269 of yacc.c.  */
+#line 255 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (2)].message_intro), (yyvsp[(2) - (2)].stringlist));
+		  po_gram_error_at_line (&(yyvsp[(1) - (2)].message_intro).pos, _("missing `msgstr' section"));
+		  free_message_intro ((yyvsp[(1) - (2)].message_intro));
+		  string_list_destroy (&(yyvsp[(2) - (2)].stringlist).stringlist);
 		}
     break;
-case 13:
-#line 267 "po-gram-gen.y"
-{
-		  yyval.message_intro.prev_ctxt = NULL;
-		  yyval.message_intro.prev_id = NULL;
-		  yyval.message_intro.prev_id_plural = NULL;
-		  yyval.message_intro.ctxt = yyvsp[0].string.string;
-		  yyval.message_intro.pos = yyvsp[0].string.pos;
-		  yyval.message_intro.obsolete = yyvsp[0].string.obsolete;
+
+  case 14:
+/* Line 1269 of yacc.c.  */
+#line 266 "po-gram-gen.y"
+    {
+		  (yyval.message_intro).prev_ctxt = NULL;
+		  (yyval.message_intro).prev_id = NULL;
+		  (yyval.message_intro).prev_id_plural = NULL;
+		  (yyval.message_intro).ctxt = (yyvsp[(1) - (1)].string).string;
+		  (yyval.message_intro).pos = (yyvsp[(1) - (1)].string).pos;
+		  (yyval.message_intro).obsolete = (yyvsp[(1) - (1)].string).obsolete;
 		}
     break;
-case 14:
-#line 276 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-1].prev, yyvsp[0].string);
-		  yyval.message_intro.prev_ctxt = yyvsp[-1].prev.ctxt;
-		  yyval.message_intro.prev_id = yyvsp[-1].prev.id;
-		  yyval.message_intro.prev_id_plural = yyvsp[-1].prev.id_plural;
-		  yyval.message_intro.ctxt = yyvsp[0].string.string;
-		  yyval.message_intro.pos = yyvsp[0].string.pos;
-		  yyval.message_intro.obsolete = yyvsp[0].string.obsolete;
+
+  case 15:
+/* Line 1269 of yacc.c.  */
+#line 275 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (2)].prev), (yyvsp[(2) - (2)].string));
+		  (yyval.message_intro).prev_ctxt = (yyvsp[(1) - (2)].prev).ctxt;
+		  (yyval.message_intro).prev_id = (yyvsp[(1) - (2)].prev).id;
+		  (yyval.message_intro).prev_id_plural = (yyvsp[(1) - (2)].prev).id_plural;
+		  (yyval.message_intro).ctxt = (yyvsp[(2) - (2)].string).string;
+		  (yyval.message_intro).pos = (yyvsp[(2) - (2)].string).pos;
+		  (yyval.message_intro).obsolete = (yyvsp[(2) - (2)].string).obsolete;
 		}
     break;
-case 15:
-#line 290 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-1].string, yyvsp[0].stringlist);
-		  yyval.prev.ctxt = yyvsp[-1].string.string;
-		  yyval.prev.id = string_list_concat_destroy (&yyvsp[0].stringlist.stringlist);
-		  yyval.prev.id_plural = NULL;
-		  yyval.prev.pos = yyvsp[-1].string.pos;
-		  yyval.prev.obsolete = yyvsp[-1].string.obsolete;
+
+  case 16:
+/* Line 1269 of yacc.c.  */
+#line 289 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].stringlist));
+		  (yyval.prev).ctxt = (yyvsp[(1) - (2)].string).string;
+		  (yyval.prev).id = string_list_concat_destroy (&(yyvsp[(2) - (2)].stringlist).stringlist);
+		  (yyval.prev).id_plural = NULL;
+		  (yyval.prev).pos = (yyvsp[(1) - (2)].string).pos;
+		  (yyval.prev).obsolete = (yyvsp[(1) - (2)].string).obsolete;
 		}
     break;
-case 16:
-#line 299 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-2].string, yyvsp[-1].stringlist);
-		  check_obsolete (yyvsp[-2].string, yyvsp[0].string);
-		  yyval.prev.ctxt = yyvsp[-2].string.string;
-		  yyval.prev.id = string_list_concat_destroy (&yyvsp[-1].stringlist.stringlist);
-		  yyval.prev.id_plural = yyvsp[0].string.string;
-		  yyval.prev.pos = yyvsp[-2].string.pos;
-		  yyval.prev.obsolete = yyvsp[-2].string.obsolete;
+
+  case 17:
+/* Line 1269 of yacc.c.  */
+#line 298 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (3)].string), (yyvsp[(2) - (3)].stringlist));
+		  check_obsolete ((yyvsp[(1) - (3)].string), (yyvsp[(3) - (3)].string));
+		  (yyval.prev).ctxt = (yyvsp[(1) - (3)].string).string;
+		  (yyval.prev).id = string_list_concat_destroy (&(yyvsp[(2) - (3)].stringlist).stringlist);
+		  (yyval.prev).id_plural = (yyvsp[(3) - (3)].string).string;
+		  (yyval.prev).pos = (yyvsp[(1) - (3)].string).pos;
+		  (yyval.prev).obsolete = (yyvsp[(1) - (3)].string).obsolete;
 		}
     break;
-case 17:
-#line 313 "po-gram-gen.y"
-{
-		  yyval.string.string = NULL;
-		  yyval.string.pos = yyvsp[0].pos.pos;
-		  yyval.string.obsolete = yyvsp[0].pos.obsolete;
+
+  case 18:
+/* Line 1269 of yacc.c.  */
+#line 312 "po-gram-gen.y"
+    {
+		  (yyval.string).string = NULL;
+		  (yyval.string).pos = (yyvsp[(1) - (1)].pos).pos;
+		  (yyval.string).obsolete = (yyvsp[(1) - (1)].pos).obsolete;
 		}
     break;
-case 18:
-#line 319 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-2].pos, yyvsp[-1].stringlist);
-		  check_obsolete (yyvsp[-2].pos, yyvsp[0].pos);
-		  yyval.string.string = string_list_concat_destroy (&yyvsp[-1].stringlist.stringlist);
-		  yyval.string.pos = yyvsp[0].pos.pos;
-		  yyval.string.obsolete = yyvsp[0].pos.obsolete;
+
+  case 19:
+/* Line 1269 of yacc.c.  */
+#line 318 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (3)].pos), (yyvsp[(2) - (3)].stringlist));
+		  check_obsolete ((yyvsp[(1) - (3)].pos), (yyvsp[(3) - (3)].pos));
+		  (yyval.string).string = string_list_concat_destroy (&(yyvsp[(2) - (3)].stringlist).stringlist);
+		  (yyval.string).pos = (yyvsp[(3) - (3)].pos).pos;
+		  (yyval.string).obsolete = (yyvsp[(3) - (3)].pos).obsolete;
 		}
     break;
-case 19:
-#line 330 "po-gram-gen.y"
-{
-		  yyval.string.string = NULL;
-		  yyval.string.pos = yyvsp[0].pos.pos;
-		  yyval.string.obsolete = yyvsp[0].pos.obsolete;
+
+  case 20:
+/* Line 1269 of yacc.c.  */
+#line 329 "po-gram-gen.y"
+    {
+		  (yyval.string).string = NULL;
+		  (yyval.string).pos = (yyvsp[(1) - (1)].pos).pos;
+		  (yyval.string).obsolete = (yyvsp[(1) - (1)].pos).obsolete;
 		}
     break;
-case 20:
-#line 336 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-2].pos, yyvsp[-1].stringlist);
-		  check_obsolete (yyvsp[-2].pos, yyvsp[0].pos);
-		  yyval.string.string = string_list_concat_destroy (&yyvsp[-1].stringlist.stringlist);
-		  yyval.string.pos = yyvsp[0].pos.pos;
-		  yyval.string.obsolete = yyvsp[0].pos.obsolete;
+
+  case 21:
+/* Line 1269 of yacc.c.  */
+#line 335 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (3)].pos), (yyvsp[(2) - (3)].stringlist));
+		  check_obsolete ((yyvsp[(1) - (3)].pos), (yyvsp[(3) - (3)].pos));
+		  (yyval.string).string = string_list_concat_destroy (&(yyvsp[(2) - (3)].stringlist).stringlist);
+		  (yyval.string).pos = (yyvsp[(3) - (3)].pos).pos;
+		  (yyval.string).obsolete = (yyvsp[(3) - (3)].pos).obsolete;
 		}
     break;
-case 21:
-#line 348 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-1].pos, yyvsp[0].stringlist);
+
+  case 22:
+/* Line 1269 of yacc.c.  */
+#line 347 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (2)].pos), (yyvsp[(2) - (2)].stringlist));
 		  plural_counter = 0;
-		  yyval.string.string = string_list_concat_destroy (&yyvsp[0].stringlist.stringlist);
-		  yyval.string.pos = yyvsp[-1].pos.pos;
-		  yyval.string.obsolete = yyvsp[-1].pos.obsolete;
+		  (yyval.string).string = string_list_concat_destroy (&(yyvsp[(2) - (2)].stringlist).stringlist);
+		  (yyval.string).pos = (yyvsp[(1) - (2)].pos).pos;
+		  (yyval.string).obsolete = (yyvsp[(1) - (2)].pos).obsolete;
 		}
     break;
-case 22:
-#line 359 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-1].pos, yyvsp[0].stringlist);
-		  yyval.string.string = string_list_concat_destroy (&yyvsp[0].stringlist.stringlist);
-		  yyval.string.pos = yyvsp[-1].pos.pos;
-		  yyval.string.obsolete = yyvsp[-1].pos.obsolete;
+
+  case 23:
+/* Line 1269 of yacc.c.  */
+#line 358 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (2)].pos), (yyvsp[(2) - (2)].stringlist));
+		  (yyval.string).string = string_list_concat_destroy (&(yyvsp[(2) - (2)].stringlist).stringlist);
+		  (yyval.string).pos = (yyvsp[(1) - (2)].pos).pos;
+		  (yyval.string).obsolete = (yyvsp[(1) - (2)].pos).obsolete;
 		}
     break;
-case 23:
-#line 370 "po-gram-gen.y"
-{
-		  yyval.rhs = yyvsp[0].rhs;
+
+  case 24:
+/* Line 1269 of yacc.c.  */
+#line 369 "po-gram-gen.y"
+    {
+		  (yyval.rhs) = (yyvsp[(1) - (1)].rhs);
 		}
     break;
-case 24:
-#line 374 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-1].rhs, yyvsp[0].rhs);
-		  yyval.rhs.rhs.msgstr = (char *) xmalloc (yyvsp[-1].rhs.rhs.msgstr_len + yyvsp[0].rhs.rhs.msgstr_len);
-		  memcpy (yyval.rhs.rhs.msgstr, yyvsp[-1].rhs.rhs.msgstr, yyvsp[-1].rhs.rhs.msgstr_len);
-		  memcpy (yyval.rhs.rhs.msgstr + yyvsp[-1].rhs.rhs.msgstr_len, yyvsp[0].rhs.rhs.msgstr, yyvsp[0].rhs.rhs.msgstr_len);
-		  yyval.rhs.rhs.msgstr_len = yyvsp[-1].rhs.rhs.msgstr_len + yyvsp[0].rhs.rhs.msgstr_len;
-		  free (yyvsp[-1].rhs.rhs.msgstr);
-		  free (yyvsp[0].rhs.rhs.msgstr);
-		  yyval.rhs.pos = yyvsp[-1].rhs.pos;
-		  yyval.rhs.obsolete = yyvsp[-1].rhs.obsolete;
+
+  case 25:
+/* Line 1269 of yacc.c.  */
+#line 373 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (2)].rhs), (yyvsp[(2) - (2)].rhs));
+		  (yyval.rhs).rhs.msgstr = XNMALLOC ((yyvsp[(1) - (2)].rhs).rhs.msgstr_len + (yyvsp[(2) - (2)].rhs).rhs.msgstr_len, char);
+		  memcpy ((yyval.rhs).rhs.msgstr, (yyvsp[(1) - (2)].rhs).rhs.msgstr, (yyvsp[(1) - (2)].rhs).rhs.msgstr_len);
+		  memcpy ((yyval.rhs).rhs.msgstr + (yyvsp[(1) - (2)].rhs).rhs.msgstr_len, (yyvsp[(2) - (2)].rhs).rhs.msgstr, (yyvsp[(2) - (2)].rhs).rhs.msgstr_len);
+		  (yyval.rhs).rhs.msgstr_len = (yyvsp[(1) - (2)].rhs).rhs.msgstr_len + (yyvsp[(2) - (2)].rhs).rhs.msgstr_len;
+		  free ((yyvsp[(1) - (2)].rhs).rhs.msgstr);
+		  free ((yyvsp[(2) - (2)].rhs).rhs.msgstr);
+		  (yyval.rhs).pos = (yyvsp[(1) - (2)].rhs).pos;
+		  (yyval.rhs).obsolete = (yyvsp[(1) - (2)].rhs).obsolete;
 		}
     break;
-case 25:
-#line 389 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-4].pos, yyvsp[-3].pos);
-		  check_obsolete (yyvsp[-4].pos, yyvsp[-2].number);
-		  check_obsolete (yyvsp[-4].pos, yyvsp[-1].pos);
-		  check_obsolete (yyvsp[-4].pos, yyvsp[0].stringlist);
-		  if (yyvsp[-2].number.number != plural_counter)
+
+  case 26:
+/* Line 1269 of yacc.c.  */
+#line 388 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (5)].pos), (yyvsp[(2) - (5)].pos));
+		  check_obsolete ((yyvsp[(1) - (5)].pos), (yyvsp[(3) - (5)].number));
+		  check_obsolete ((yyvsp[(1) - (5)].pos), (yyvsp[(4) - (5)].pos));
+		  check_obsolete ((yyvsp[(1) - (5)].pos), (yyvsp[(5) - (5)].stringlist));
+		  if ((yyvsp[(3) - (5)].number).number != plural_counter)
 		    {
 		      if (plural_counter == 0)
-			po_gram_error_at_line (&yyvsp[-4].pos.pos, _("first plural form has nonzero index"));
+			po_gram_error_at_line (&(yyvsp[(1) - (5)].pos).pos, _("first plural form has nonzero index"));
 		      else
-			po_gram_error_at_line (&yyvsp[-4].pos.pos, _("plural form has wrong index"));
+			po_gram_error_at_line (&(yyvsp[(1) - (5)].pos).pos, _("plural form has wrong index"));
 		    }
 		  plural_counter++;
-		  yyval.rhs.rhs.msgstr = string_list_concat_destroy (&yyvsp[0].stringlist.stringlist);
-		  yyval.rhs.rhs.msgstr_len = strlen (yyval.rhs.rhs.msgstr) + 1;
-		  yyval.rhs.pos = yyvsp[-4].pos.pos;
-		  yyval.rhs.obsolete = yyvsp[-4].pos.obsolete;
+		  (yyval.rhs).rhs.msgstr = string_list_concat_destroy (&(yyvsp[(5) - (5)].stringlist).stringlist);
+		  (yyval.rhs).rhs.msgstr_len = strlen ((yyval.rhs).rhs.msgstr) + 1;
+		  (yyval.rhs).pos = (yyvsp[(1) - (5)].pos).pos;
+		  (yyval.rhs).obsolete = (yyvsp[(1) - (5)].pos).obsolete;
 		}
     break;
-case 26:
-#line 412 "po-gram-gen.y"
-{
-		  string_list_init (&yyval.stringlist.stringlist);
-		  string_list_append (&yyval.stringlist.stringlist, yyvsp[0].string.string);
-		  yyval.stringlist.pos = yyvsp[0].string.pos;
-		  yyval.stringlist.obsolete = yyvsp[0].string.obsolete;
+
+  case 27:
+/* Line 1269 of yacc.c.  */
+#line 411 "po-gram-gen.y"
+    {
+		  string_list_init (&(yyval.stringlist).stringlist);
+		  string_list_append (&(yyval.stringlist).stringlist, (yyvsp[(1) - (1)].string).string);
+		  (yyval.stringlist).pos = (yyvsp[(1) - (1)].string).pos;
+		  (yyval.stringlist).obsolete = (yyvsp[(1) - (1)].string).obsolete;
 		}
     break;
-case 27:
-#line 419 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-1].stringlist, yyvsp[0].string);
-		  yyval.stringlist.stringlist = yyvsp[-1].stringlist.stringlist;
-		  string_list_append (&yyval.stringlist.stringlist, yyvsp[0].string.string);
-		  yyval.stringlist.pos = yyvsp[-1].stringlist.pos;
-		  yyval.stringlist.obsolete = yyvsp[-1].stringlist.obsolete;
+
+  case 28:
+/* Line 1269 of yacc.c.  */
+#line 418 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (2)].stringlist), (yyvsp[(2) - (2)].string));
+		  (yyval.stringlist).stringlist = (yyvsp[(1) - (2)].stringlist).stringlist;
+		  string_list_append (&(yyval.stringlist).stringlist, (yyvsp[(2) - (2)].string).string);
+		  (yyval.stringlist).pos = (yyvsp[(1) - (2)].stringlist).pos;
+		  (yyval.stringlist).obsolete = (yyvsp[(1) - (2)].stringlist).obsolete;
 		}
     break;
-case 28:
-#line 430 "po-gram-gen.y"
-{
-		  string_list_init (&yyval.stringlist.stringlist);
-		  string_list_append (&yyval.stringlist.stringlist, yyvsp[0].string.string);
-		  yyval.stringlist.pos = yyvsp[0].string.pos;
-		  yyval.stringlist.obsolete = yyvsp[0].string.obsolete;
+
+  case 29:
+/* Line 1269 of yacc.c.  */
+#line 429 "po-gram-gen.y"
+    {
+		  string_list_init (&(yyval.stringlist).stringlist);
+		  string_list_append (&(yyval.stringlist).stringlist, (yyvsp[(1) - (1)].string).string);
+		  (yyval.stringlist).pos = (yyvsp[(1) - (1)].string).pos;
+		  (yyval.stringlist).obsolete = (yyvsp[(1) - (1)].string).obsolete;
 		}
     break;
-case 29:
-#line 437 "po-gram-gen.y"
-{
-		  check_obsolete (yyvsp[-1].stringlist, yyvsp[0].string);
-		  yyval.stringlist.stringlist = yyvsp[-1].stringlist.stringlist;
-		  string_list_append (&yyval.stringlist.stringlist, yyvsp[0].string.string);
-		  yyval.stringlist.pos = yyvsp[-1].stringlist.pos;
-		  yyval.stringlist.obsolete = yyvsp[-1].stringlist.obsolete;
+
+  case 30:
+/* Line 1269 of yacc.c.  */
+#line 436 "po-gram-gen.y"
+    {
+		  check_obsolete ((yyvsp[(1) - (2)].stringlist), (yyvsp[(2) - (2)].string));
+		  (yyval.stringlist).stringlist = (yyvsp[(1) - (2)].stringlist).stringlist;
+		  string_list_append (&(yyval.stringlist).stringlist, (yyvsp[(2) - (2)].string).string);
+		  (yyval.stringlist).pos = (yyvsp[(1) - (2)].stringlist).pos;
+		  (yyval.stringlist).obsolete = (yyvsp[(1) - (2)].stringlist).obsolete;
 		}
     break;
-}
 
-#line 705 "bison.simple"
 
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#if YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
+/* Line 1269 of yacc.c.  */
+#line 1810 "po-gram-gen.c"
+      default: break;
     }
-#endif
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
-#if YYLSP_NEEDED
-  *++yylsp = yyloc;
-#endif
+
 
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
@@ -1312,11 +1824,11 @@ case 29:
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTBASE];
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
   goto yynewstate;
 
@@ -1329,155 +1841,126 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("parse error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
 	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exhausted");
-	}
-      else
-#endif /* defined (YYERROR_VERBOSE) */
-	yyerror ("parse error");
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
     }
-  goto yyerrlab1;
 
 
-/*--------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action |
-`--------------------------------------------------*/
-yyerrlab1:
+
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-		  yychar, yytname[yychar1]));
-      yychar = YYEMPTY;
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
+  goto yyerrlab1;
 
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
 
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
 
-/*-------------------------------------------------------------------.
-| yyerrdefault -- current state does not do anything special for the |
-| error token.                                                       |
-`-------------------------------------------------------------------*/
-yyerrdefault:
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
 
-  /* If its default is to accept any token, ok.  Otherwise pop it.  */
-  yyn = yydefact[yystate];
-  if (yyn)
-    goto yydefault;
-#endif
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
 
 
-/*---------------------------------------------------------------.
-| yyerrpop -- pop the current state because it cannot handle the |
-| error token                                                    |
-`---------------------------------------------------------------*/
-yyerrpop:
-  if (yyssp == yyss)
-    YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#if YYLSP_NEEDED
-  yylsp--;
-#endif
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
-#if YYDEBUG
-  if (yydebug)
+  for (;;)
     {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "Error: state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
 
-/*--------------.
-| yyerrhandle.  |
-`--------------*/
-yyerrhandle:
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
 
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
 
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
-  else if (yyn == 0)
-    goto yyerrpop;
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
+  *++yyvsp = yylval;
 
-  YYDPRINTF ((stderr, "Shifting error token, "));
 
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -1497,19 +1980,41 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-/*---------------------------------------------.
-| yyoverflowab -- parser overflow comes here.  |
-`---------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
+#endif
 
 yyreturn:
+  if (yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-  return yyresult;
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
-#line 445 "po-gram-gen.y"
+
+
+
diff --git a/gettext-tools/src/po-gram-gen.h b/gettext-tools/src/po-gram-gen.h
index 5c8a2df9e..f73f45f70 100644
--- a/gettext-tools/src/po-gram-gen.h
+++ b/gettext-tools/src/po-gram-gen.h
@@ -1,9 +1,85 @@
-#ifndef BISON_PO_GRAM_GEN_H
-# define BISON_PO_GRAM_GEN_H
+/* A Bison parser, made by GNU Bison 2.3a.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     COMMENT = 258,
+     DOMAIN = 259,
+     JUNK = 260,
+     PREV_MSGCTXT = 261,
+     PREV_MSGID = 262,
+     PREV_MSGID_PLURAL = 263,
+     PREV_STRING = 264,
+     MSGCTXT = 265,
+     MSGID = 266,
+     MSGID_PLURAL = 267,
+     MSGSTR = 268,
+     NAME = 269,
+     NUMBER = 270,
+     STRING = 271
+   };
+#endif
+/* Tokens.  */
+#define COMMENT 258
+#define DOMAIN 259
+#define JUNK 260
+#define PREV_MSGCTXT 261
+#define PREV_MSGID 262
+#define PREV_MSGID_PLURAL 263
+#define PREV_STRING 264
+#define MSGCTXT 265
+#define MSGID 266
+#define MSGID_PLURAL 267
+#define MSGSTR 268
+#define NAME 269
+#define NUMBER 270
+#define STRING 271
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{/* Line 1487 of yacc.c.  */
+#line 143 "po-gram-gen.y"
 
-#ifndef YYSTYPE
-typedef union
-{
   struct { char *string; lex_pos_ty pos; bool obsolete; } string;
   struct { string_list_ty stringlist; lex_pos_ty pos; bool obsolete; } stringlist;
   struct { long number; lex_pos_ty pos; bool obsolete; } number;
@@ -11,26 +87,15 @@ typedef union
   struct { char *ctxt; char *id; char *id_plural; lex_pos_ty pos; bool obsolete; } prev;
   struct { char *prev_ctxt; char *prev_id; char *prev_id_plural; char *ctxt; lex_pos_ty pos; bool obsolete; } message_intro;
   struct { struct msgstr_def rhs; lex_pos_ty pos; bool obsolete; } rhs;
-} yystype;
-# define YYSTYPE yystype
+}
+/* Line 1487 of yacc.c.  */
+#line 93 "po-gram-gen.h"
+	YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
 #endif
-# define	COMMENT	257
-# define	DOMAIN	258
-# define	JUNK	259
-# define	PREV_MSGCTXT	260
-# define	PREV_MSGID	261
-# define	PREV_MSGID_PLURAL	262
-# define	PREV_STRING	263
-# define	MSGCTXT	264
-# define	MSGID	265
-# define	MSGID_PLURAL	266
-# define	MSGSTR	267
-# define	NAME	268
-# define	NUMBER	269
-# define	STRING	270
-
 
 extern YYSTYPE yylval;
 
-#endif /* not BISON_PO_GRAM_GEN_H */
+
diff --git a/gettext-tools/tests/xg-c-1.ok.po b/gettext-tools/tests/xg-c-1.ok.po
index 302b64263..5e27a9c34 100644
--- a/gettext-tools/tests/xg-c-1.ok.po
+++ b/gettext-tools/tests/xg-c-1.ok.po
@@ -1,8 +1,9 @@
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"License GPLv3+: GNU GPL version 3 or later \n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #, c-format
@@ -210,6 +211,10 @@ msgstr ""
 msgid "                                (only language C++)\n"
 msgstr ""
 
+#, c-format
+msgid "      --kde                   recognize KDE 4 format strings\n"
+msgstr ""
+
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
@@ -296,6 +301,14 @@ msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
+#, c-format
+msgid "      --package-name=PACKAGE  set package name in output\n"
+msgstr ""
+
+#, c-format
+msgid "      --package-version=VERSION  set package version in output\n"
+msgstr ""
+
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"